15bf74cf26815fddfb1f7e256403eb8d1f17e1e4 - platform/frameworks/base

commit	15bf74cf26815fddfb1f7e256403eb8d1f17e1e4	[log] [tgz]
author	Bernardo Rufino <brufino@google.com>	Fri Aug 16 13:06:33 2019 +0100
committer	Bernardo Rufino <brufino@google.com>	Fri Aug 16 14:54:18 2019 +0100
tree	c4ed04c097417ccab0bbb07d41e45e66431c0806
parent	aa032460ca184733144b91d1ba42d1af9e10439b [diff]

Merge Trampoline and BMS

Perform the merge by:
1. Moving lifecycle inside Trampoline without IDE support
(since we'll rename Trampoline in this CL as well, making the published binder
the same).
2. Move constants to Trampoline without IDE support as well (again, we'll
rename Trampoline).
3. Change the last usages of BMS constructor to use
Trampoline's. Now BMS is effectively empty.
4. Delete BMS.
5. Rename Trampoline to BMS with IDE support (renaming related classes
and variables that the IDE could find).
6. \o/

Split CL into Path Sets to ease review:
Base > PS2: Steps 1..4 (+121 -333)
PS2 > PS4: Step 5 (+214 -204)

Test: m -j
Test: adb shell dumpsys backup
Test: atest BackupManagerServiceTest BackupManagerServiceRoboTest
Bug: 135661048
Change-Id: Ia6cd340d3c5fcdb9c8f409035d032efeb090cd20

services/backup/java/com/android/server/backup/BackupManagerService.java[diff]
services/backup/java/com/android/server/backup/FullBackupJob.java[diff]
services/backup/java/com/android/server/backup/KeyValueBackupJob.java[diff]
services/backup/java/com/android/server/backup/Trampoline.java[Deleted - diff]
services/backup/java/com/android/server/backup/UserBackupManagerService.java[diff]
services/robotests/backup/src/com/android/server/backup/BackupManagerServiceRoboTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/TrampolineRoboTest.java - diff]
services/robotests/backup/src/com/android/server/backup/BackupManagerServiceTest.java[Deleted - diff]
services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java[diff]
services/robotests/backup/src/com/android/server/backup/testing/BackupManagerServiceTestUtils.java[diff]
services/tests/servicestests/src/com/android/server/backup/BackupManagerServiceTest.java[Renamed from services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java - diff]

10 files changed