commit ef07513c299098324c7b0ed10dca9efe5e62c802
author Xin Li <delphij@google.com> Wed Oct 06 22:53:51 2021 +0000
committer Xin Li <delphij@google.com> Wed Oct 06 22:53:51 2021 +0000
tree d0a393ae3b39216349894ef823a8080b1dbb0a8d
parent 6e08f0d4d89b0a809394159229763daa9aabe5ee
parent d1de55e73631f3a6f6490cd6fac2ef552f97c190

Merge Android 12

Bug: 202323961
Merged-In: I607aeb0147fd05a0d23f22214f1fa3b1eeacf0d5
Change-Id: I4e4311068ddda3dbf284864000ef770b61d1d6ae

Android.bp

diff --git a/Android.bp b/Android.bp
index 4316cc8..f4ff986 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,7 +31,7 @@
 
     platform_apis: true,
 
-    required: ["privapp_whitelist_com.android.car.radio"],
+    required: ["allowed_privapp_com.android.car.radio"],
 
     certificate: "platform",
 

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eccbf94..1f1b7de 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -52,7 +52,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LAUNCHER_APP" />
-                <category android:name="android.intent.category.APP_MUSIC" />
             </intent-filter>
         </activity>
 

src/com/android/car/radio/DisplayController.java

diff --git a/src/com/android/car/radio/DisplayController.java b/src/com/android/car/radio/DisplayController.java
index 14b131e..b2a09b5 100644
--- a/src/com/android/car/radio/DisplayController.java
+++ b/src/com/android/car/radio/DisplayController.java
@@ -50,7 +50,6 @@
 
     private final Context mContext;
 
-    private final View mToolbar;
     private final View mViewpager;
     private final TextView mStatusMessage;
     private final TextView mChannel;
@@ -85,7 +84,6 @@
             @NonNull RadioController radioController) {
         mContext = Objects.requireNonNull(activity);
 
-        mToolbar = activity.findViewById(R.id.toolbar);
         mViewpager = activity.findViewById(R.id.viewpager);
         mStatusMessage = activity.findViewById(R.id.status_message);
         mChannel = activity.findViewById(R.id.station_channel);
@@ -144,9 +142,6 @@
         if (mFavoriteButton != null) {
             mFavoriteButton.setVisibility(enabled ? View.VISIBLE : View.GONE);
         }
-        if (mToolbar != null) {
-            mToolbar.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
-        }
         if (mViewpager != null) {
             mViewpager.setVisibility(enabled ? View.VISIBLE : View.GONE);
         }