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

Commit 1109a0c5 authored by Varun Shah's avatar Varun Shah
Browse files

Initial splitting of Content Providers from AMS. 

This is the first of many CLs for refactoring Content Provider related
code from Activity Manager Service.

This CL simply pulls out most of the CP code from AMS into its own
class. There are no logic or lock-related changes in this particular CL.

Bug: 156262145
Test: atest ContentProviderTest [all]
Change-Id: I03310a1f06d354e15439a37f7aeffa543192dad3
parent b652eec2

services/core/java/com/android/server/am/ActivityManagerDebugConfig.java

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ class ActivityManagerDebugConfig { 
    static final String POSTFIX_PROCESS_OBSERVERS = (APPEND_CATEGORY_NAME)

            ? "_ProcessObservers" : "";

    static final String POSTFIX_PROCESSES = (APPEND_CATEGORY_NAME) ? "_Processes" : "";

    static final String POSTFIX_PROVIDER = (APPEND_CATEGORY_NAME) ? "_Provider" : "";

    static final String POSTFIX_PSS = (APPEND_CATEGORY_NAME) ? "_Pss" : "";

    static final String POSTFIX_SERVICE = (APPEND_CATEGORY_NAME) ? "_Service" : "";

    static final String POSTFIX_SERVICE_EXECUTING =

services/core/java/com/android/server/am/ActivityManagerService.java

+135 −1648

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/am/ContentProviderHelper.java

0 → 100644
+1708 −0

File added.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/am/OWNERS

+2 −0
Original line number Diff line number Diff line
@@ -31,3 +31,5 @@ narayan@google.com 
per-file SettingsToPropertiesMapper.java = omakoto@google.com, svetoslavganov@google.com, yamasani@google.com



per-file CarUserSwitchingDialog.java = keunyoung@google.com, felipeal@google.com, gurunagarajan@google.com



per-file ContentProviderHelper.java = varunshah@google.com, omakoto@google.com, jsharkey@google.com, yamasani@google.com

services/core/java/com/android/server/am/UserController.java

+1 −1
Original line number Diff line number Diff line
@@ -2883,7 +2883,7 @@ class UserController implements Handler.Callback { 
        }



        void installEncryptionUnawareProviders(@UserIdInt int userId) {

            mService.installEncryptionUnawareProviders(userId);

            mService.mCpHelper.installEncryptionUnawareProviders(userId);

        }



        void showUserSwitchingDialog(UserInfo fromUser, UserInfo toUser,