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

Commit 6a68e2f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update language to comply with Android's inclusive language guidance"

parents 8f1309a6 c2e4513f

res/xml/privacy_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        android:persistent="false"

        settings:controller="com.android.settings.backup.ConfigureAccountPreferenceController">

        <!-- the Intent declared here is always overwritten by a real one -->

        <intent android:action="dummy" />

        <intent android:action="placeholder" />

    </Preference>



    <Preference

src/com/android/settings/applications/appops/AppOpsState.java

+5 −5
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ public class AppOpsState { 
            if (appEntry == null) {

                continue;

            }

            List<AppOpsManager.OpEntry> dummyOps = null;

            List<AppOpsManager.OpEntry> stubOps = null;

            AppOpsManager.PackageOps pkgOps = null;

            if (appInfo.requestedPermissions != null) {

                for (int j=0; j<appInfo.requestedPermissions.length; j++) {
@@ -611,15 +611,15 @@ public class AppOpsState { 
                        if (appEntry.hasOp(permOps.get(k))) {

                            continue;

                        }

                        if (dummyOps == null) {

                            dummyOps = new ArrayList<AppOpsManager.OpEntry>();

                        if (stubOps == null) {

                            stubOps = new ArrayList<AppOpsManager.OpEntry>();

                            pkgOps = new AppOpsManager.PackageOps(

                                    appInfo.packageName, appInfo.applicationInfo.uid, dummyOps);

                                    appInfo.packageName, appInfo.applicationInfo.uid, stubOps);



                        }

                        AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(

                                permOps.get(k), AppOpsManager.MODE_ALLOWED, Collections.emptyMap());

                        dummyOps.add(opEntry);

                        stubOps.add(opEntry);

                        addOp(entries, pkgOps, appEntry, opEntry, packageName == null,

                                packageName == null ? 0 : opToOrder[opEntry.getOp()]);

                    }

src/com/android/settings/backup/SettingsBackupHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class SettingsBackupHelper extends BackupAgentHelper { 


            try (FileOutputStream out = new FileOutputStream(newState.getFileDescriptor())) {

                if (getVersionCode(oldState) != VERSION_CODE) {

                    data.writeEntityHeader("dummy", 1);

                    data.writeEntityHeader("placeholder", 1);

                    data.writeEntityData(new byte[1], 1);

                }

src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ public abstract class ProfileSelectFragment extends DashboardFragment { 


    @Override

    protected int getPreferenceScreenResId() {

        return R.xml.dummy_preference_screen;

        return R.xml.placeholder_preference_screen;

    }



    @Override