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

Commit 31556d65 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Update language to comply with Android's inclusive language guidance" into main am: 5e6c5c36

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2720059



Change-Id: I2c3a3dfff2d26c0a54148c4bb10876f37dd65412
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84ea9c5e 5e6c5c36

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -3960,14 +3960,14 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                mContext.enforceCallingOrSelfPermission(

                mContext.enforceCallingOrSelfPermission(

                        android.Manifest.permission.BIND_APPWIDGET, null);

                        android.Manifest.permission.BIND_APPWIDGET, null);

            } catch (SecurityException se) {

            } catch (SecurityException se) {

                if (!isCallerBindAppWidgetWhiteListedLocked(packageName)) {

                if (!isCallerBindAppWidgetAllowListedLocked(packageName)) {

                    return false;

                    return false;

                }

                }

            }

            }

            return true;

            return true;

        }

        }





        private boolean isCallerBindAppWidgetWhiteListedLocked(String packageName) {

        private boolean isCallerBindAppWidgetAllowListedLocked(String packageName) {

            final int userId = UserHandle.getCallingUserId();

            final int userId = UserHandle.getCallingUserId();

            final int packageUid = getUidForPackage(packageName, userId);

            final int packageUid = getUidForPackage(packageName, userId);

            if (packageUid < 0) {

            if (packageUid < 0) {