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

Commit 2ac39a66 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge "[Pod] Add interface for SystemUIApplication." into main

parents 18ed70c5 5e9e4a0a

packages/SystemUI/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -149,9 +149,9 @@ filegroup { 
        "tests/src/**/systemui/qs/external/TileServicesTest.java",

        "tests/src/**/systemui/ambient/touch/TouchMonitorTest.java",

        "tests/src/**/systemui/accessibility/WindowMagnificationSettingsTest.java",

        "tests/src/**/systemui/application/impl/SystemUIApplicationImplTest.kt",

        "tests/src/**/systemui/CameraProtectionLoaderImplTest.kt",

        "tests/src/**/systemui/SliceBroadcastRelayHandlerTest.java",

        "tests/src/**/systemui/SystemUIApplicationTest.kt",

        "tests/src/**/systemui/SysUICutoutProviderTest.kt",

        "tests/src/**/keyguard/AdminSecondaryLockScreenControllerTest.java",

        "tests/src/**/keyguard/KeyguardStatusViewControllerTest.java",

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ 
    <protected-broadcast android:name="com.android.systemui.STARTED" />



    <application

        android:name=".SystemUIApplication"

        android:name=".application.impl.SystemUIApplicationImpl"

        android:persistent="true"

        android:allowClearUserData="false"

        android:backupAgent=".backup.BackupHelper"

packages/SystemUI/src/com/android/systemui/CoreStartable.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import java.io.PrintWriter; 
 *  </pre>

 *

 *

 * @see SystemUIApplication#startSystemUserServicesIfNeeded()

 * @see com.android.systemui.application.SystemUIApplication#startSystemUserServicesIfNeeded()

 */

public interface CoreStartable extends Dumpable {

    String STARTABLE_DEPENDENCIES = "startable_dependencies";

packages/SystemUI/src/com/android/systemui/SystemUISecondaryUserService.java

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Intent; 
import android.os.IBinder;

import android.util.Log;



import com.android.systemui.application.SystemUIApplication;

import com.android.systemui.process.ProcessWrapper;



import javax.inject.Inject;

packages/SystemUI/src/com/android/systemui/SystemUIService.java

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ import android.os.UserHandle; 
import android.util.Slog;



import com.android.internal.os.BinderInternal;

import com.android.systemui.application.SystemUIApplication;

import com.android.systemui.application.impl.SystemUIApplicationImpl;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dump.DumpHandler;
@@ -43,6 +45,7 @@ import java.io.PrintWriter; 
import javax.inject.Inject;



public class SystemUIService extends Service {

    private static final String TAG = "SystemUIService";



    private final Handler mMainHandler;

    private final DumpHandler mDumpHandler;
@@ -105,7 +108,7 @@ public class SystemUIService extends Service { 
                    new BinderInternal.BinderProxyCountEventListener() {

                        @Override

                        public void onLimitReached(int uid) {

                            Slog.w(SystemUIApplication.TAG,

                            Slog.w(TAG,

                                    "uid " + uid + " sent too many Binder proxies to uid "

                                    + Process.myUid());

                        }