Jason Monk
c6032d371d
Sysui doesn't have a bp, it has an mk...
...
Test: none
Change-Id: I8e2516f5bfc4ba4e53c240a977b6939f834cb319
2017-09-19 09:25:35 -04:00
Jason Monk
91c732f196
Add owners file for sysui
...
Test: none
Change-Id: I1fa120661eba67e1d9c1dd179076e86f3e7e3663
2017-09-18 15:45:33 -04:00
TreeHugger Robot
28834a6697
Merge changes I5e42dee6,Ic8571c08
...
* changes:
[RefactoredBMS] Ensure backup doesn't reuse ack tokens nearby in time
[RefactoredBMS] Eliminate a race condition that could lead to calling PBT#finalizeBackup() twice
2017-09-18 15:08:09 +00:00
Charles He
2fe81c0605
Merge "Status bar: correctly register disable flags"
2017-09-18 14:49:02 +00:00
TreeHugger Robot
da33359915
Merge "Test that the replace flag does not need to be set"
2017-09-18 14:24:41 +00:00
TreeHugger Robot
676b3d2b5e
Merge "[RefactoredBMS] Offload the mRunningFullBackupTask.handleCancel() call from the main thread to another thread"
2017-09-18 14:15:55 +00:00
TreeHugger Robot
df9f5f77c9
Merge "[RefactoredBMS] Add log before doRestoreFinished is called on BackupAgent."
2017-09-18 14:07:49 +00:00
TreeHugger Robot
56b19d4937
Merge "Ignore only internal volume keys when in VR mode."
2017-09-18 13:53:05 +00:00
Charles He
ede390982c
Status bar: correctly register disable flags
...
StatusBarManager has two sets of disable flags to control the visibility
of various UI components. These flags are registered in DisableRecord.
This CL fixes a bug where clearing one set of disable flags causes both
sets of flags to be cleared.
Bug: 65813446
Test: runtest systemui
Change-Id: I95948fd2464402b6f2fd123dba34b64aeeb80c90
2017-09-18 14:31:17 +01:00
Michal Karpinski
f9b74cc7ef
[RefactoredBMS] Ensure backup doesn't reuse ack tokens nearby in time
...
This CL replicates both ag/2551800 and ag/2613950 in RefactoredBMS.
Test: runtest -p com.android.server.backup frameworks-services
Bug: 37973765
Change-Id: I5e42dee67d587adabbfb81de03f3205d92a46add
2017-09-18 14:18:17 +01:00
TreeHugger Robot
a7a2a0545a
Merge changes I3d638a98,I55d18254
...
* changes:
[RefactoredBMS] Add tracing for UserState and a few services
[RefactoredBMS] Call removeMessages() only for certain operations in RefactoredBackupManagerService#handleCancel()
2017-09-18 13:00:55 +00:00
Michal Karpinski
78ec67a264
[RefactoredBMS] Eliminate a race condition that could lead to
...
calling PBT#finalizeBackup() twice
This CL replicates ag/2510127 in RefactoredBMS.
Test: runtest -p com.android.server.backup frameworks-services
Bug: 37973765
Change-Id: Ic8571c08dd92386d0e4f79d7866aeb0f19f38106
2017-09-18 13:44:31 +01:00
Michal Karpinski
f95cf5d9c3
[RefactoredBMS] Offload the mRunningFullBackupTask.handleCancel()
...
call from the main thread to another thread
This CL replicates both ag/2135862 and ag/2465381 in RefactoredBMS.
Test: runtest -p com.android.server.backup frameworks-services
Bug: 37973765
Change-Id: I895cb27bc910d9970ab1c33cd54a773b8f9b6cf6
2017-09-18 13:34:44 +01:00
Michal Karpinski
3f09d6cf3b
[RefactoredBMS] Add log before doRestoreFinished is called on BackupAgent.
...
This CL replicates ag/2140301 in RefactoredBMS.
Test: runtest -p com.android.server.backup frameworks-services
Bug: 37973765
Change-Id: I2c2795c89035dd6c38aee8aec4e4a95cfdba0846
2017-09-18 13:23:51 +01:00
Michal Karpinski
3d87a5bfaf
[RefactoredBMS] Add tracing for UserState and a few services
...
This CL replicates ag/2500023 in RefactoredBMS.
Test: adb shell am instrument -w -e package com.android.server.backup com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Bug: 37973765
Change-Id: I3d638a98ff61954797d9e5a70a28e0c2962112c6
2017-09-18 12:25:50 +01:00
Michal Karpinski
a7924a6795
[RefactoredBMS] Call removeMessages() only for certain operations in RefactoredBackupManagerService#handleCancel()
...
This CL replicates ag/2147459 in RefactoredBMS.
Test: adb shell am instrument -w -e package com.android.server.backup com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Bug: 37973765
Change-Id: I55d1825477ce82c47fd5850bf00f34ee8c1b9fc0
2017-09-18 12:20:34 +01:00
Joachim Sauer
0d25e75d92
Merge "Remove use of MeasureUnit.internalGetInstance"
2017-09-18 10:37:47 +00:00
Andrii Kulian
bcd3f07cc2
Merge "Fix consequent activity launch on virtual displays" into oc-mr1-dev am: 7a09f7ec9c
...
am: af642f5914
2017-09-18 06:45:45 +00:00
Andrii Kulian
af642f5914
Merge "Fix consequent activity launch on virtual displays" into oc-mr1-dev
...
am: 7a09f7ec9c
2017-09-18 06:35:15 +00:00
Andrii Kulian
7a09f7ec9c
Merge "Fix consequent activity launch on virtual displays" into oc-mr1-dev
2017-09-18 06:25:46 +00:00
Sungsoo Lim
816d1e39d6
Merge "Change the route name for USB headset"
2017-09-18 04:28:47 +00:00
Bill Yi
0d6f5d2ad3
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c3f81baeee -s ours
...
am: 72b2814607
2017-09-17 22:37:32 +00:00
Bill Yi
72b2814607
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: c3f81baeee
2017-09-17 22:26:21 +00:00
Bill Yi
c3f81baeee
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-17 22:18:14 +00:00
Bill Yi
e43596160c
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 420ae05329 -s ours
...
am: 52ff2bf2a1
2017-09-16 21:24:54 +00:00
Bill Yi
743945015d
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9b4683842d -s ours
...
am: e43dfbad3b
2017-09-16 21:12:11 +00:00
Bill Yi
52ff2bf2a1
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 420ae05329
2017-09-16 21:11:47 +00:00
Bill Yi
1bbc878f5d
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: ba3347b48a -s ours
...
am: 2e3be621b6
2017-09-16 21:05:53 +00:00
TreeHugger Robot
420ae05329
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-16 20:52:54 +00:00
Bill Yi
4b780af321
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: adbd504f40 -s ours
...
am: 2a8bb45240
2017-09-16 20:51:01 +00:00
Bill Yi
e43dfbad3b
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 9b4683842d
2017-09-16 20:50:00 +00:00
Bill Yi
2e3be621b6
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: ba3347b48a
2017-09-16 20:46:31 +00:00
Bill Yi
4a102609a2
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4498012c8b -s ours
...
am: acc482472c
2017-09-16 20:43:29 +00:00
Bill Yi
f216e539fc
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 3231634e2b -s ours
...
am: 62ee030f38
2017-09-16 20:34:19 +00:00
Bill Yi
2a8bb45240
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: adbd504f40
2017-09-16 20:29:36 +00:00
Bill Yi
d9b89b1a7b
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: e0b4672a4e -s ours
...
am: 55f717f446
2017-09-16 20:27:45 +00:00
Bill Yi
acc482472c
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 4498012c8b
2017-09-16 20:26:10 +00:00
Bill Yi
b404a168c6
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 14a340ff61 -s ours
...
am: 4a4fda8901
2017-09-16 20:22:56 +00:00
Bill Yi
62ee030f38
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 3231634e2b
2017-09-16 20:22:13 +00:00
TreeHugger Robot
9b4683842d
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-16 20:19:42 +00:00
Bill Yi
522d56ec32
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: fa04d2e02a -s ours
...
am: 7e1d4c91b9
2017-09-16 20:18:48 +00:00
Bill Yi
55f717f446
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: e0b4672a4e
2017-09-16 20:17:07 +00:00
Bill Yi
a222984b17
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 22d6738d16 -s ours
...
am: 6ea0804dfc
2017-09-16 20:12:06 +00:00
Bill Yi
4a4fda8901
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 14a340ff61
2017-09-16 20:12:00 +00:00
Bill Yi
7e1d4c91b9
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: fa04d2e02a
2017-09-16 20:08:25 +00:00
Bill Yi
0058e4577e
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9a2468011f -s ours
...
am: ff2ef3477f
2017-09-16 20:08:14 +00:00
TreeHugger Robot
ba3347b48a
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-16 20:05:22 +00:00
TreeHugger Robot
adbd504f40
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-16 20:02:32 +00:00
Bill Yi
6ea0804dfc
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 22d6738d16
2017-09-16 20:01:58 +00:00
TreeHugger Robot
4498012c8b
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-16 20:01:27 +00:00
