Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f26c9301 authored by Jackal Guo's avatar Jackal Guo
Browse files

Update language to comply with Android's inclusive language guidance 

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161898202
Test: Build pass and boot
Change-Id: Idf2227a862371fc3ea690b4fe0e5d8ac905cf7be
parent 0f54ce6b

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -14466,7 +14466,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                resolvedType, resultTo, resultCode, resultData, resultExtras, requiredPermissions,

                appOp, bOptions, ordered, sticky, callingPid, callingUid, realCallingUid,

                realCallingPid, userId, false /* allowBackgroundActivityStarts */,

                null /* tokenNeededForBackgroundActivityStarts */, null /* broadcastWhitelist */);

                null /* tokenNeededForBackgroundActivityStarts */, null /* broadcastAllowList */);

    }















    @GuardedBy("this")










@@ -15310,7 +15310,7 @@ public class ActivityManagerService extends IActivityManager.Stub













                        OP_NONE, bOptions, serialized, sticky, -1, uid, realCallingUid,















                        realCallingPid, userId, allowBackgroundActivityStarts,















                        backgroundActivityStartsToken,













                        null /*broadcastWhitelist*/);













                        null /* broadcastAllowList */);















            } finally {















                Binder.restoreCallingIdentity(origId);















            }

























services/core/java/com/android/server/pm/PackageManagerService.java



+13
−13




























Original line number
Diff line number
Diff line








@@ -2229,7 +2229,7 @@ public class PackageManagerService extends IPackageManager.Stub













                    sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,















                            extras, 0 /*flags*/,















                            installerPackageName, null /*finishedReceiver*/,













                            updateUserIds, instantUserIds, null /* broadcastWhitelist */);













                            updateUserIds, instantUserIds, null /* broadcastAllowList */);















                }















                // if the required verifier is defined, but, is not the installer of record















                // for the package, it gets notified









@@ -2239,7 +2239,7 @@ public class PackageManagerService extends IPackageManager.Stub













                    sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,















                            extras, 0 /*flags*/,















                            mRequiredVerifierPackage, null /*finishedReceiver*/,













                            updateUserIds, instantUserIds, null /* broadcastWhitelist */);













                            updateUserIds, instantUserIds, null /* broadcastAllowList */);















                }















                // If package installer is defined, notify package installer about new















                // app installed









@@ -2247,7 +2247,7 @@ public class PackageManagerService extends IPackageManager.Stub













                    sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,















                            extras, Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND /*flags*/,















                            mRequiredInstallerPackage, null /*finishedReceiver*/,













                            firstUserIds, instantUserIds, null /* broadcastWhitelist */);













                            firstUserIds, instantUserIds, null /* broadcastAllowList */);















                }





























                // Send replaced for users that don't see the package for the first time









@@ -2260,19 +2260,19 @@ public class PackageManagerService extends IPackageManager.Stub













                        sendPackageBroadcast(Intent.ACTION_PACKAGE_REPLACED, packageName,















                                extras, 0 /*flags*/,















                                installerPackageName, null /*finishedReceiver*/,













                                updateUserIds, instantUserIds, null /*broadcastWhitelist*/);













                                updateUserIds, instantUserIds, null /*broadcastAllowList*/);















                    }















                    if (notifyVerifier) {















                        sendPackageBroadcast(Intent.ACTION_PACKAGE_REPLACED, packageName,















                                extras, 0 /*flags*/,















                                mRequiredVerifierPackage, null /*finishedReceiver*/,













                                updateUserIds, instantUserIds, null /*broadcastWhitelist*/);













                                updateUserIds, instantUserIds, null /*broadcastAllowList*/);















                    }















                    sendPackageBroadcast(Intent.ACTION_MY_PACKAGE_REPLACED,















                            null /*package*/, null /*extras*/, 0 /*flags*/,















                            packageName /*targetPackage*/,















                            null /*finishedReceiver*/, updateUserIds, instantUserIds,













                            null /*broadcastWhitelist*/);













                            null /*broadcastAllowList*/);















                } else if (launchedForRestore && !res.pkg.isSystem()) {















                    // First-install and we did a restore, so we're responsible for the















                    // first-launch broadcast.










@@ -14595,7 +14595,7 @@ public class PackageManagerService extends IPackageManager.Stub













    private void sendFirstLaunchBroadcast(String pkgName, String installerPkg,















            int[] userIds, int[] instantUserIds) {















        sendPackageBroadcast(Intent.ACTION_PACKAGE_FIRST_LAUNCH, pkgName, null, 0,













                installerPkg, null, userIds, instantUserIds, null /* broadcastWhitelist */);













                installerPkg, null, userIds, instantUserIds, null /* broadcastAllowList */);















    }





























    private abstract class HandlerParams {










@@ -18715,14 +18715,14 @@ public class PackageManagerService extends IPackageManager.Stub













            packageSender.sendPackageBroadcast(Intent.ACTION_PACKAGE_REPLACED, removedPackage,















                    extras, 0, null /*targetPackage*/, null, null, null, broadcastAllowList);















            packageSender.sendPackageBroadcast(Intent.ACTION_MY_PACKAGE_REPLACED, null, null, 0,













                    removedPackage, null, null, null, null /* broadcastWhitelist */);













                    removedPackage, null, null, null, null /* broadcastAllowList */);















            if (installerPackageName != null) {















                packageSender.sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED,















                        removedPackage, extras, 0 /*flags*/,













                        installerPackageName, null, null, null, null /* broadcastWhitelist */);













                        installerPackageName, null, null, null, null /* broadcastAllowList */);















                packageSender.sendPackageBroadcast(Intent.ACTION_PACKAGE_REPLACED,















                        removedPackage, extras, 0 /*flags*/,













                        installerPackageName, null, null, null, null /* broadcastWhitelist */);













                        installerPackageName, null, null, null, null /* broadcastAllowList */);















            }















        }
























@@ -25684,7 +25684,7 @@ interface PackageSender {













    void sendPackageBroadcast(final String action, final String pkg,















            final Bundle extras, final int flags, final String targetPkg,















            final IIntentReceiver finishedReceiver, final int[] userIds, int[] instantUserIds,













        @Nullable SparseArray<int[]> broadcastWhitelist);













            @Nullable SparseArray<int[]> broadcastAllowList);















    void sendPackageAddedForNewUsers(String packageName, boolean sendBootCompleted,















            boolean includeStopped, int appId, int[] userIds, int[] instantUserIds,















            int dataLoaderType);

























services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -48,7 +48,7 @@ public class PackageManagerServiceTest {













            public void sendPackageBroadcast(final String action, final String pkg,















                    final Bundle extras, final int flags, final String targetPkg,















                    final IIntentReceiver finishedReceiver, final int[] userIds,













                    int[] instantUserIds, SparseArray<int[]> broadcastWhitelist) {













                    int[] instantUserIds, SparseArray<int[]> broadcastAllowList) {















            }































            public void sendPackageAddedForNewUsers(String packageName,