summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/SystemServer.java
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge changes from topic "IPMS1" am: 3627deac88 am: 54d91e605cChalard Jean2019-01-111-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2304c7c508 Change-Id: I6908f68b1b9e7079384c4cc9f11c4e46cce694ce
| * \ \ \ \ Merge changes from topic "IPMS1" am: 3627deac88Chalard Jean2019-01-111-8/+19
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | am: 54d91e605c Change-Id: I2541996b9bfe338acabac858fdea0ad89d55df5b
| | * | | | [MS01] Add the IP memory store service.Chalard Jean2019-01-111-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 116512211 Test: Added initial tests Change-Id: I9d9af4097e3e2d7afd9956b9cbfa29a9f9558ae0
* | | | | | Merge "Enable airplane mode when booting in safe mode"TreeHugger Robot2019-01-111-3/+26
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Enable airplane mode when booting in safe modeRene Mayrhofer2018-12-271-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to boot in airplane mode when it was not turned on before shutdown/reboot, either for situations where this is required by regulation or to work around problems in normal boot. When safe mode is engaged (Vol-Down), disable in two stages: 1. Set Settings.Global.AIRPLANE_MODE_ON as early as possible for subsystems to react to it during their initialization. 2. Trigger the public ConnectiviyService API to enable airplane mode. This has to be done during later stages in initialization because it requires sending broadcasts, so some RF leakage may still happen before airplane mode is enabled (time window of a few seconds). Bluetooth is not currently disabled and needs to be fixed by another change. WiFi and NFC are turned off alongside cellular modems. Test: manual Bug: 120145930 Change-Id: I1d61990a9d6f7cd046d28b3e49ecf402dd485063
* | | | | | services: Add iorap forwarding serviceIgor Murashkin2019-01-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new service to system_server. It purely forwards data from internal APIs to iorapd over binder, it is not a binder service itself. Currently forwards ActivityMetricsLaunchObserver APIs from ActivityTaskManagerInternal. Bug: 72170747 Change-Id: Ic4fa283df1c16660099030c74a0039ef24866819
* | | | | | Move rollback manager implementation to RollbackManagerServiceImplRichard Uhler2019-01-021-1/+1
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that RollbackManagerService extends SystemService as per convention and RollbackManagerServiceImpl need not be made public. Bug: 112431924 Test: atest RollbackTest Change-Id: I85d2fd27e4705637d5fb7342d9389ef12f869fc9
* | | | | Merge "Add RollbackManagerService"Richard Uhler2018-12-311-0/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add RollbackManagerServiceRichard Uhler2018-12-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds RollbackManagerService as a new system service for managing apk level rollbacks. To work properly this requires additional selinux policy changes. Fails gracefully in case of selinux denials, until we have a chance to sort out the proper selinux policy. Bug: 112431924 Bug: 116512606 Test: atest RollbackTest, with selinux enforcement off. Test: atest CtsPermission2TestCases:PermissionPolicyTest Change-Id: Id72aae9c4d8da9aaab3922ec9233ba335bc0198f
* | | | | Merge "Start NetworkStack on system server start" am: 394b0d1a04 am: d69c3d4193Remi NGUYEN VAN2018-12-251-0/+10
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | am: 8d73c6ec16 Change-Id: I0c116a73bfb8ab82c798ebdf0ab587f00be031ed
| * | | | Merge "Start NetworkStack on system server start" am: 394b0d1a04Remi NGUYEN VAN2018-12-251-0/+10
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | am: d69c3d4193 Change-Id: I00ce231850d69e32f836d8f508e28a4dc741226f
| | * | | Start NetworkStack on system server startRemi NGUYEN VAN2018-12-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The network stack will host updatable network components that are being moved from the system server. Test: flashed, booted Bug: b/112869080 Change-Id: I63f98405b69615e7077aed374b8f34a84fb1e4b2
| | * | | DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into masterXin Li2018-12-111-1/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bug: 120502534 Change-Id: Idc8bfb6d97a869b76cfb87ca1a494201baf9e8bd
| | * \ \ \ Merge "Revert "Revert "Schematize vold system properties"""Treehugger Robot2018-12-111-1/+2
| | |\ \ \ \
| | | * | | | Revert "Revert "Schematize vold system properties""Inseob Kim2018-12-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2473b08b07ccd58978d4b0271dc22a770b9b8605. Reason for revert: Fixed build breakage sysprop_cpp and sysprop_java directly have been linking against libprotobuf-cpp-full and do not set proto.type field, which could cause ASAN error due to linking against both libproto version of full and lite. Change-Id: I96eb47444d7b6f6b5fef092efc1514fcdd6f33b6 Merged-In: I8e04f643197b6c8a60cc38c6979e41c5de3469f5
| * | | | | | Schematize vold system propertiesInseob Kim2018-12-131-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0a91222c83 Change-Id: I3462d493bf88d7a435573659af9d8fa2062723b0
| | * | | | | | Schematize vold system propertiesInseob Kim2018-12-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properties accessed across partitions are now schematized and will become APIs to make explicit interfaces among partitions. Bug: 117924132 Test: m -j Change-Id: I8e04f643197b6c8a60cc38c6979e41c5de3469f5 Merged-In: Iedfd3c1dda665006ea5410ee787c3ca447ac7db1 (cherry picked from commit c1246e6c364bbfef18d566f6b16f46ca1a5216c5)
| | * | | | | | DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into ↵Xin Li2018-12-101-1/+10
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | stage-aosp-master Bug: 120502534 Change-Id: I7351a1832c4bd2fd86324183ab83e9088d716822
| * | | | | | Merge "Revert "Schematize vold system properties"" am: 6ee45c6f14Anthony Stange2018-12-071-2/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 510c8c463f Change-Id: If137d417a8f042e8cbde842578caaa3e54bb8c6d
| | * | | | | Merge "Revert "Schematize vold system properties""Anthony Stange2018-12-071-2/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Revert "Schematize vold system properties"Anthony Stange2018-12-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7bc31dc162dd6c97eeb4d85058a079a74bd8777b. Reason for revert: Breaking aosp_master build. Change-Id: I34a5e9889c17e3454a0a86deabcec3c192a3da52
| * | | | | | Merge "Schematize vold system properties" am: 095d0f640eInseob Kim2018-12-061-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 73694f8faa Change-Id: If420ffa861d9d85f2baca9224b96f2716965f4b5
| | * | | | | Merge "Schematize vold system properties"Treehugger Robot2018-12-071-1/+2
| | |\| | | |
| | | * | | | Schematize vold system propertiesInseob Kim2018-12-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properties accessed across partitions are now schematized and will become APIs to make explicit interfaces among partitions. Bug: 117924132 Test: m -j Change-Id: I8e04f643197b6c8a60cc38c6979e41c5de3469f5 Merged-In: I8e04f643197b6c8a60cc38c6979e41c5de3469f5
* | | | | | | Temporarily move MULTI_CLIENT_IME_ENABLED to frameworks.jarYohei Yukawa2018-12-251-1/+2
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparation to implement per-profile IME in InputMethodManagerService (IMMS). Multi-client IME is designed and implemented to be able to deal with multiple profiles at the same time from its beginning [1]. This means that when multi-client IME is enabled with system properties, it also means that per-profile IME is enabled. At the same time, the following classes need to change its behavior whether per-profile IME is enabled or not. * android.provider.Setings * com.android.server.inputmethod.InputMethodManagerService * com.android.server.textservices.TextServicesManagerService * com.android.server.devicepolicy.DevicePolicyManagerService * com.android.server.devicepolicy.OverlayPackagesProvider The problem is that android.provider.Setings lives in the frameworks.jar. Hence if we want to expose something like PER_PROFILE_IME_ENABLED to android.provider.Setings, then such a flag needs to live in frameworks.jar. Note that this is expected to be a temporary change. Once per-profile IME becomes always enabled in IMMS, we can safely roll back this change. Note also that static initializer of InputMethodSystemProperty is expected to be evaluated only once as long as InputMethodSystemProperty is loaded before Zygote. [1]: I41dfe854557b178d8af740bc2869c936fc88608b bae5bea23cfac3769569a230b56ad85cdd000675 Bug: 120709962 Test: prebuilts/checkstyle/checkstyle.py -f \ frameworks/base/core/java/android/view/inputmethod/InputMethodSystemProperty.java Test: Manually verified as follows: 1. make -j MultiClientInputMethod 2. adb install -r $OUT/system/priv-app/MultiClientInputMethod/MultiClientInputMethod.apk 3. adb root 4. adb shell setprop persist.debug.multi_client_ime \ com.example.android.multiclientinputmethod/.MultiClientInputMethod 5. adb reboot 6. Make sure that multi-client IME is enabled Change-Id: Iad8aba7edb1e60ccc1ce5192a11e01b6aa8d00a0
* | | | | | Inline some Settings constants so they don't break the SettingsBackupTest.Felipe Leme2018-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: echo 'In TreeHugger we trust!' Bug: 121153631 Change-Id: I7a1180a3446ba6a5aabb76fbe87113bf0e3096c6
* | | | | | Fixed how ContentCapture is kill-switched.Felipe Leme2018-12-191-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We provide a way for OEMs to kill-switch Content Capture, but it currently does not work in the first boot (which uses default settings). This CL changes the mechanism: - If the property is not set, it assumes it's disabled (before it was only disabled when explicitly set to "false"). - To always enable it, it must be set to "always" (before it was "true"). - To check for the overlaid resource, it must be set to "default" (before it had to be unset). Test: manual verification Fixes: 121144410 Bug: 121153631 Change-Id: Ie669e43d9dce947a7bb31bc3b1768774f724675f
* | | | | | Prototype Spaceship mode qstileChad Brubaker2018-12-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial prototype disabling location/sensors and enabling airplane mode. Camera/Mic will come in a followup. Test: manual Bug: 110842805 Change-Id: I26132fcc9ffea83e3e78a0e54882d23c99ee590c
* | | | | | Separate job service for dynamic code logging.Alan Stokes2018-12-131-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple logging of dynamic code loading from background DEX optimisation/reconciliation (BackgroundDexOptService). Add DynamicCodeLoggingService to run DCL logging daily while idle and charging. Update DexLoggerIntegrationTests to use the new job, and to verify that we now handle unknown class loaders. Bug: 111336847 Test: atest -p services/core/java/com/android/server/pm/dex Change-Id: Id688a7eef5976120be12606e726830ce32451a1e
* | | | | | Merge "ColorDisplayService should always be started"Christine Franks2018-12-101-6/+3
|\ \ \ \ \ \
| * | | | | | ColorDisplayService should always be startedChristine Franks2018-12-101-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if no color transforms are available, for requesting whether color modes or configurations are available. Bug: 111215474 Test: atest FrameworksServicesTest:ColorDisplayServiceTest Change-Id: I10a4b3b1214920117312e752ba5ea0033ff70293
* | | | | | | Merge "Yet another (major) refactoring on Content Capture and Augmented ↵Felipe Leme2018-12-071-11/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Autofill."
| * | | | | | | Yet another (major) refactoring on Content Capture and Augmented Autofill.Felipe Leme2018-12-061-11/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bunch of changes: - Split public SmartSuggestionsService info ContentCaptureService and AugmentedAutofillService - Renamed 'intelligence' packages to either 'contentcapture' or 'autofil.augmented' - Renamed internal packages and classes. - Changed permissions, resource names, etc... - Moved Augmented Autofill logic from IntelligeceManagerService (R.I.P.) to Autofill. - Optimized IPCs by passing a String instead of the InteractionSessionId (that also solves the view -> service dependency). Test: atest CtsContentCaptureServiceTestCases \ CtsAutoFillServiceTestCases \ FrameworksCoreTests:SettingsBackupTest Test: manual verification with Augmented Autofill Service Bug: 119638877 Bug: 117944706 Change-Id: I787fc2a0dbd9ad53e4d5edb0d2a9242346e4652d
* | | | | | | Merge "SystemServer: initialize ADB before USB"Kenny Root2018-12-071-9/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | SystemServer: initialize ADB before USBKenny Root2018-12-051-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | USB depends on ADB to hold the state for ADB debugging enabled, so move it to initialize before USB attempts to initialize. This removes a race condition introduced by moving the source of truth for ADB debugging enabled to the AdbService instead of UsbService. Bug: 119765805 Test: boot emulator several times Change-Id: Ib1f5ae0ceab5abe64e2d14b9e2b3a55c9919ad2f
* | | | | | | Merge "Use WindowProcessController configuration for process"Yunfan Chen2018-12-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use WindowProcessController configuration for processYunfan Chen2018-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is to replace the process configuration map in WindowManagerService with the map in ActivityTaskManagerService. To do so, we pass the ActivityTaskManagerService instance to WindowManaserService. Adjust test base accordingly. Test: WmTests Test: go/wm-smoke Bug: 117877476 Bug: 113253755 Change-Id: Ica93c3ad402e1cab682466fd16a8226176f9bae8
* | | | | | | | Merge "Changed how the Smart Suggestions service is defined."TreeHugger Robot2018-12-051-11/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Changed how the Smart Suggestions service is defined.Felipe Leme2018-12-041-11/+35
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially it was defined as secure Settings, but the proper way is to let the OEMs set it by overlaying a framework resources, which an option to temporarily override that setting using a Shell cmd (so it can be changed on CTS tests). This CL also changes how the service can be explicitly enabled / disabled at the time the system starts, so it can be disabled by a server-push in case of emergencies (and also manually enable by developers when running the CTS tests on AOSP builds). Bug: 119776618 Bug: 111276913 Bug: 117779333 Test: adb shell settings put global \ smart_suggestions_service_explicitly_enabled true && \ sleep 10s && \ adb shell stop && adb shell start \ atest CtsContentCaptureServiceTestCases Test: atest FrameworksCoreTests:SettingsBackupTest Test: atest CtsAutoFillServiceTestCases # to make sure it didn't break Test: m -j SettingsProvider Change-Id: Ibd1bba0c0d534b4b6344516d8ff893142785a57a
* | | | | | | | Merge "New receiver for signed config."Mathew Inwood2018-12-051-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | New receiver for signed config.Mathew Inwood2018-12-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new receiver is added when the system server is created. It receives broadcasts and pulls out the config & signature, but doesn't yet do anything with it. go/serverless-config-design Test: Manual Bug: 110509075 Change-Id: Ie369e198de5e830253b17e964afb67c76735909c
* | | | | | | | Merge "Schematize vold system properties"TreeHugger Robot2018-12-051-1/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Schematize vold system propertiesInseob Kim2018-11-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properties accessed across partitions are now schematized and will become APIs to make explicit interfaces among partitions. Bug: 117924132 Test: m -j Change-Id: I8e04f643197b6c8a60cc38c6979e41c5de3469f5 (cherry picked from commit 0cf5fc1433ef113d33d40b62cfca9ce97de12a4b)
* | | | | | | | Merge "Add a service for reporting runtime debug info" am: 08cbafefdc am: ↵Neil Fuller2018-12-041-0/+8
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20547cf20d am: b5354b7ca9 Change-Id: I2395418164f3dbcb04bc18647c6cccf7a025c1b4
| * | | | | | | Merge "Add a service for reporting runtime debug info" am: 08cbafefdcNeil Fuller2018-12-041-0/+8
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 20547cf20d Change-Id: I29e7fe0355c7461ca6b939c669b9e4f3d471c4b6
| | * | | | | | Add a service for reporting runtime debug infoNeil Fuller2018-12-031-0/+8
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a service for reporting runtime debug info via dumpsys. With expected OEM customization / module versions in play it makes sense to have runtime and associated "core library" information in bug reports. The dumpsys information can also be used from from host-side tests. Bug: 119026403 Bug: 118242715 Test: adb shell dumpsys runtimeinfo Change-Id: I62637a1c8bfd65d5de9b3e47b8700ead4bc314f2
* | | | | | | Merge "[Multi-user] Rename GlobalBackupManagerService -> BackupManagerService"Annie Meng2018-11-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [Multi-user] Rename GlobalBackupManagerService -> BackupManagerServiceAnnie Meng2018-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore original naming since UserBackupManagerService is now merged. Just find and replace, no functionality changes in this CL. Bug: 118520567 Test: 1) atest RunFrameworksServicesRoboTests 2) atest $(find \ frameworks/base/services/tests/servicestests/src/com/android/server/backup \ -name '*Test.java') 3) adb shell bmgr flows Change-Id: Ia37997cec93fac9ebb5102edfff9000c9cff4eb1
* | | | | | | | Merge "[Multi-user] Extract BackupManagerService to UserBackupManagerService"Annie Meng2018-11-281-1/+1
|\| | | | | | |
| * | | | | | | [Multi-user] Extract BackupManagerService to UserBackupManagerServiceAnnie Meng2018-11-271-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BMS is split into GlobalBMS and UserBMS. UserBMS: - Core backup/restore implementations and bookkeeping. - Will be per user in a future CL (only one instance in this CL to limit scope of changes). GlobalBMS: - System service definition, interaction with Trampoline, user-aware operations. - Will be renamed back to BMS in a future CL (so BMS history can follow UserBMS in this CL). *** Reviewers, please pay attention to the patchset breakdown to better understand what is a rename/move vs. new changes *** * Base -> Patchset 2: BMS splits into GlobalBMS and UserBMS (MOVE ONLY) Patchset 1: Rename BMS -> UserBMS Patchset 2: Move parts of UserBMS to GlobalBMS No new functionality, only moving existing code. * Patchset 2 -> Patchset 3: New functionality for GlobalBMS - Switch references from BMS to GlobalBMS in Trampoline.java. - Change the definition of the system service in SystemServer.java to GlobalBMS. - Instantiate one instance of UserBMS in GlobalBMS constructor. - Add all IBackupManager methods, which for now just directly calls the corresponding method in UserBMS. * Patchset 3 -> Patchset 4: Migrate usages of BMS in code (RENAME ONLY) Find and replace, no new functionality. * Patchset 4 -> Patchset 5: Migrate usages of BMS in tests (RENAME ONLY) Find and replace, no new functionality. * Patchset 5 -> Patchset 6: New tests for GlobalBMS Add tests for all the new IBackupManager methods added (just tests straight redirection for now). * Overall: View Patchset 2 -> [Latest Patchset] for new code. TODO: Modify art-profile with rename Bug: 118520567 Test: 1) atest RunFrameworksServicesRoboTests 2) atest $(find frameworks/base/services/tests/servicestests/src/com/android/server/backup -name '*Test.java') 3) atest GtsBackupHostTestCases 4) atest CtsBackupTestCases 5) atest CtsBackupHostTestCases 6) atest DeviceOwnerTest 7) 'Backup Now' in Settings 8) Cloud and d2d restore in SUW; deferred restore 9) All 'adb shell bmgr' flows 10) adb backup; adb restore Change-Id: Ib5a5837375fe950bc7d33a5e31cca16b605541f9