Snap for 8564071 from 14c252498e7f03de8c5c6a65fdf1d7393b5ffcd6 to mainline-cellbroadcast-releaseaml_cbr_341710000aml_cbr_341610000aml_cbr_341510010aml_cbr_341410010aml_cbr_341311010aml_cbr_341110000aml_cbr_341011000aml_cbr_340914000aml_cbr_331910000aml_cbr_331810000aml_cbr_331710020aml_cbr_331610010aml_cbr_331510000aml_cbr_331411000aml_cbr_331310010aml_cbr_331111030aml_cbr_331013010aml_cbr_330911010aml_cbr_330810000android14-mainline-cellbroadcast-releaseandroid13-mainline-cellbroadcast-release

Change-Id: I2deb89305856d69dffbf935d56bebc9091e24772

11 files changed, 30 insertions, 30 deletions

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/tvleanback/data/VideoDatabase.java b/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/tvleanback/data/VideoDatabase.java
index c547f42f..944ed443 100644
--- a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/tvleanback/data/VideoDatabase.java
+++ b/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/tvleanback/data/VideoDatabase.java
@@ -261,7 +261,7 @@ public class VideoDatabase {
                     }
                 }
             }
-            // add dummy movies to illustrate action deep link in search detail
+            // add stub movies to illustrate action deep link in search detail
             // Android TV Search requires that the media’s title, MIME type, production year,
             // and duration all match exactly to those found from Google’s servers.
             addMovieForDeepLink(mHelperContext.getString(R.string.noah_title),
@@ -307,7 +307,7 @@ public class VideoDatabase {
         }
 
         /**
-         * Add an entry to the database for dummy deep link.
+         * Add an entry to the database for stub deep link.
          *
          * @return rowId or -1 if failed
          */
diff --git a/prebuilts/androidtv/sample-inputs/app/src/main/AndroidManifest.xml b/prebuilts/androidtv/sample-inputs/app/src/main/AndroidManifest.xml
index 14ad57e2..04da9681 100644
--- a/prebuilts/androidtv/sample-inputs/app/src/main/AndroidManifest.xml
+++ b/prebuilts/androidtv/sample-inputs/app/src/main/AndroidManifest.xml
@@ -101,9 +101,9 @@
                 android:resource="@xml/syncadapter" />
         </service>
 
-        <!-- Since the channel/program feed here does not require any authentication, we use a dummy
+        <!-- Since the channel/program feed here does not require any authentication, we use a stub
         account used for SyncAdapter. -->
-        <service android:name=".syncadapter.DummyAccountService">
+        <service android:name=".syncadapter.StubAccountService">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
diff --git a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/rich/RichSetupFragment.java b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/rich/RichSetupFragment.java
index a306e5ef..726c459c 100644
--- a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/rich/RichSetupFragment.java
+++ b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/rich/RichSetupFragment.java
@@ -46,7 +46,7 @@ import com.example.android.sampletvinput.R;
 import com.example.android.sampletvinput.TvContractUtils;
 import com.example.android.sampletvinput.rich.RichTvInputService.ChannelInfo;
 import com.example.android.sampletvinput.rich.RichTvInputService.TvInput;
-import com.example.android.sampletvinput.syncadapter.DummyAccountService;
+import com.example.android.sampletvinput.syncadapter.StubAccountService;
 import com.example.android.sampletvinput.syncadapter.SyncUtils;
 import com.squareup.picasso.Picasso;
 import com.squareup.picasso.Target;
@@ -238,7 +238,7 @@ public class RichSetupFragment extends DetailsFragment {
                     if (mFinished) {
                         return;
                     }
-                    Account account = DummyAccountService.getAccount(SyncUtils.ACCOUNT_TYPE);
+                    Account account = StubAccountService.getAccount(SyncUtils.ACCOUNT_TYPE);
                     boolean syncActive = ContentResolver.isSyncActive(account,
                             TvContract.AUTHORITY);
                     boolean syncPending = ContentResolver.isSyncPending(account,
diff --git a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/DummyAccountService.java b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/StubAccountService.java
index 8f7c6f03..93f52707 100644
--- a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/DummyAccountService.java
+++ b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/StubAccountService.java
@@ -28,13 +28,13 @@ import android.os.IBinder;
 
 
 /**
- * Dummy account service for SyncAdapter. Note that this does nothing because this input uses a feed
+ * Stub account service for SyncAdapter. Note that this does nothing because this input uses a feed
  * which does not require any authentication.
  */
-public class DummyAccountService extends Service {
-    private static final String TAG = "DummyAccountService";
-    private DummyAuthenticator mAuthenticator;
-    public static final String ACCOUNT_NAME = "DummyAccount";
+public class StubAccountService extends Service {
+    private static final String TAG = "StubAccountService";
+    private StubAuthenticator mAuthenticator;
+    public static final String ACCOUNT_NAME = "StubAccount";
 
     public static Account getAccount(String accountType) {
         return new Account(ACCOUNT_NAME, accountType);
@@ -42,7 +42,7 @@ public class DummyAccountService extends Service {
 
     @Override
     public void onCreate() {
-        mAuthenticator = new DummyAuthenticator(this);
+        mAuthenticator = new StubAuthenticator(this);
     }
 
     @Override
@@ -51,11 +51,11 @@ public class DummyAccountService extends Service {
     }
 
     /**
-     * Dummy Authenticator used in {@link SyncAdapter}. This does nothing for all the operations
+     * Stub Authenticator used in {@link SyncAdapter}. This does nothing for all the operations
      * since channel/program feed does not require any authentication.
      */
-    public class DummyAuthenticator extends AbstractAccountAuthenticator {
-        public DummyAuthenticator(Context context) {
+    public class StubAuthenticator extends AbstractAccountAuthenticator {
+        public StubAuthenticator(Context context) {
             super(context);
         }
 
diff --git a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/SyncUtils.java b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/SyncUtils.java
index 0cd33b84..d582fa16 100644
--- a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/SyncUtils.java
+++ b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/SyncUtils.java
@@ -33,7 +33,7 @@ public class SyncUtils {
     public static final String ACCOUNT_TYPE = "com.example.android.sampletvinput.account";
 
     public static void setUpPeriodicSync(Context context, String inputId) {
-        Account account = DummyAccountService.getAccount(ACCOUNT_TYPE);
+        Account account = StubAccountService.getAccount(ACCOUNT_TYPE);
         AccountManager accountManager =
                 (AccountManager) context.getSystemService(Context.ACCOUNT_SERVICE);
         if (!accountManager.addAccountExplicitly(account, null, null)) {
@@ -52,7 +52,7 @@ public class SyncUtils {
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
         bundle.putString(SyncAdapter.BUNDLE_KEY_INPUT_ID, inputId);
-        ContentResolver.requestSync(DummyAccountService.getAccount(ACCOUNT_TYPE), CONTENT_AUTHORITY,
+        ContentResolver.requestSync(StubAccountService.getAccount(ACCOUNT_TYPE), CONTENT_AUTHORITY,
                 bundle);
     }
 }
diff --git a/prebuilts/androidtv/visual-game-controller/src/com/example/android/visualgamecontroller/util/SystemUiHider.java b/prebuilts/androidtv/visual-game-controller/src/com/example/android/visualgamecontroller/util/SystemUiHider.java
index dba48674..52c6917d 100644
--- a/prebuilts/androidtv/visual-game-controller/src/com/example/android/visualgamecontroller/util/SystemUiHider.java
+++ b/prebuilts/androidtv/visual-game-controller/src/com/example/android/visualgamecontroller/util/SystemUiHider.java
@@ -91,7 +91,7 @@ public abstract class SystemUiHider {
     /**
      * The current visibility callback.
      */
-    protected OnVisibilityChangeListener mOnVisibilityChangeListener = sDummyListener;
+    protected OnVisibilityChangeListener mOnVisibilityChangeListener = sNoOpListener;
 
     /**
      * Creates and returns an instance of {@link SystemUiHider} that is
@@ -159,16 +159,16 @@ public abstract class SystemUiHider {
      */
     public void setOnVisibilityChangeListener(OnVisibilityChangeListener listener) {
         if (listener == null) {
-            listener = sDummyListener;
+            listener = sNoOpListener;
         }
 
         mOnVisibilityChangeListener = listener;
     }
 
     /**
-     * A dummy no-op callback for use when there is no other listener set.
+     * A no-op callback for use when there is no other listener set.
      */
-    private static OnVisibilityChangeListener sDummyListener = new OnVisibilityChangeListener() {
+    private static OnVisibilityChangeListener sNoOpListener = new OnVisibilityChangeListener() {
         @Override
         public void onVisibilityChange(boolean visible) {
         }
diff --git a/prebuilts/gradle/AppRestrictionEnforcer/README.md b/prebuilts/gradle/AppRestrictionEnforcer/README.md
index c379650c..cccd37cd 100644
--- a/prebuilts/gradle/AppRestrictionEnforcer/README.md
+++ b/prebuilts/gradle/AppRestrictionEnforcer/README.md
@@ -13,7 +13,7 @@ enforce specific policies on a managed device. The system provides policies
 that control settings such as password complexity, screen lock, or camera
 availability. Developers can also augment this list with custom policies
 that control specific features within their applications. For example,
-a web browser could provide access to a whitelist of allowed domains.
+a web browser could provide access to a list of allowed domains.
 
 This sample demonstrates the 'admin' component and shows how a number of
 custom properties (booleans, strings, numbers, lists) can be set and
diff --git a/prebuilts/gradle/ContentProviderPaging/app/src/main/java/com/example/android/contentproviderpaging/ImageProvider.java b/prebuilts/gradle/ContentProviderPaging/app/src/main/java/com/example/android/contentproviderpaging/ImageProvider.java
index 3db420d3..91b19b26 100644
--- a/prebuilts/gradle/ContentProviderPaging/app/src/main/java/com/example/android/contentproviderpaging/ImageProvider.java
+++ b/prebuilts/gradle/ContentProviderPaging/app/src/main/java/com/example/android/contentproviderpaging/ImageProvider.java
@@ -57,7 +57,7 @@ public class ImageProvider extends ContentProvider {
         sUriMatcher.addURI(ImageContract.AUTHORITY, "images/#", IMAGE_ID);
     }
 
-    // Indicated how many same images are going to be written as dummy images
+    // Indicated how many same images are going to be written as unused images
     private static final int REPEAT_COUNT_WRITE_FILES = 10;
 
     private File mBaseDir;
@@ -71,7 +71,7 @@ public class ImageProvider extends ContentProvider {
             return false;
         }
         mBaseDir = context.getFilesDir();
-        writeDummyFilesToStorage(context);
+        writeUnusedFilesToStorage(context);
 
         return true;
     }
@@ -185,10 +185,10 @@ public class ImageProvider extends ContentProvider {
 
     /**
      * Preload sample files packaged in the apk into the internal storage directory.  This is a
-     * dummy function specific to this demo.  The MyCloud mock cloud service doesn't actually
+     * function specific to this demo.  The MyCloud mock cloud service doesn't actually
      * have a backend, so it simulates by reading content from the device's internal storage.
      */
-    private void writeDummyFilesToStorage(Context context) {
+    private void writeUnusedFilesToStorage(Context context) {
         if (mBaseDir.list().length > 0) {
             return;
         }
@@ -202,7 +202,7 @@ public class ImageProvider extends ContentProvider {
     }
 
     /**
-     * Write a file to internal storage.  Used to set up our dummy "cloud server".
+     * Write a file to internal storage.  Used to set up our mock "cloud server".
      *
      * @param context   the Context
      * @param resId     the resource ID of the file to write to internal storage
diff --git a/prebuilts/gradle/PictureInPicture/README.md b/prebuilts/gradle/PictureInPicture/README.md
index 5c146947..bec93241 100644
--- a/prebuilts/gradle/PictureInPicture/README.md
+++ b/prebuilts/gradle/PictureInPicture/README.md
@@ -21,7 +21,7 @@ Lifecycle][5].
 To specify that your activity can use PIP mode, set `android:supportsPictureInPicture` to `true` in
 the manifest. (Beginning with Android O, you do not need to set
 `android:resizeableActivity` to `true` if you are supporting PIP mode you only need to
-`setrandroid:resizeableActivity` if your activity supports other multi-window modes.)
+set `android:resizeableActivity` if your activity supports other multi-window modes.)
 
 You can pass a [PictureInPictureParams][6] to [enterPictureInPictureMode()][7] to specify how an
 activity should behave when it is in PiP mode. You can also use it to call
diff --git a/prebuilts/gradle/PictureInPicture/kotlinApp/README.md b/prebuilts/gradle/PictureInPicture/kotlinApp/README.md
index aa7f4482..e1cbfca4 100644
--- a/prebuilts/gradle/PictureInPicture/kotlinApp/README.md
+++ b/prebuilts/gradle/PictureInPicture/kotlinApp/README.md
@@ -20,7 +20,7 @@ Lifecycle][5].
 To specify that your activity can use PIP mode, set `android:supportsPictureInPicture` to `true` in
 the manifest. (Beginning with the O Developer Preview, you do not need to set
 `android:resizeableActivity` to `true` if you are supporting PIP mode, either on Android TV or on
-other Android devices; you only need to `setrandroid:resizeableActivity` if your activity supports
+other Android devices; you only need to set `android:resizeableActivity` if your activity supports
 other multi-window modes.)
 
 You can pass a [PictureInPictureParams][6] to [enterPictureInPictureMode()][7] to specify how an
diff --git a/prebuilts/gradle/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/MainActivity.java b/prebuilts/gradle/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/MainActivity.java
index 37db139d..6b475618 100644
--- a/prebuilts/gradle/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/MainActivity.java
+++ b/prebuilts/gradle/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/MainActivity.java
@@ -42,7 +42,7 @@ import com.example.android.system.runtimepermissions.contacts.ContactsFragment;
  * Contacts permissions (({@link android.Manifest.permission#READ_CONTACTS} and ({@link
  * android.Manifest.permission#WRITE_CONTACTS})) are requested when the 'Show and Add Contacts'
  * button is
- * clicked to display the first contact in the contacts database and to add a dummy contact
+ * clicked to display the first contact in the contacts database and to add a fake contact
  * directly to it. Permissions are verified and requested through compat helpers in the support v4
  * library, in this Activity using {@link ActivityCompat}.
  * First, permissions are checked if they have already been granted through {@link