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

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

Merge "Fix AutoRevokePermissions non-mobile launch NPE" into rvc-dev

parents 8dfe7994 6470647d

res/layout-television/permissions_frame.xml

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,13 @@ 
            android:background="@color/lb_preference_decor_list_background"

            android:layout_gravity="end">



        <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:visibility="gone">

            <include layout="@layout/progress_header" />

        </FrameLayout>



        <FrameLayout

                android:id="@+id/prefs_container"

                android:layout_width="match_parent"

src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt

+1 −0
Original line number Diff line number Diff line
@@ -612,6 +612,7 @@ class AutoRevokeService : JobService() { 
            .setColor(getColor(android.R.color.system_notification_accent_color))

            .setAutoCancel(true)

            .setContentIntent(pendingIntent)

            .extend(Notification.TvExtender())

        Utils.getSettingsLabelForNotifications(applicationContext.packageManager)?.let {

            settingsLabel ->

            val extras = Bundle()

src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ public final class ManagePermissionsActivity extends FragmentActivity { 
                        || DeviceUtils.isTelevision(this)) {

                    androidXFragment = com.android.permissioncontroller.permission.ui.handheld

                            .AutoRevokeFragment.newInstance();

                    androidXFragment.setArguments(AutoRevokeFragment.createArgs(sessionId));

                } else {

                    setNavGraph(AutoRevokeFragment.createArgs(sessionId), R.id.auto_revoke);

                    return;