OSDN Git Service
Mike Reed [Tue, 19 Sep 2017 21:01:30 +0000 (17:01 -0400)]
switch to unique_ptr version of Skia stream api
Test: make
Change-Id: I49703b85fa3e7a256a0b0df7a7f53bc18a68e22b
TreeHugger Robot [Mon, 18 Sep 2017 21:04:47 +0000 (21:04 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 18 Sep 2017 20:56:20 +0000 (20:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
69ca32dcea -s ours am:
60af01bec9 -s ours am:
6c4c6b047c -s ours
am:
d33ed97339 -s ours
Change-Id: I209a4d9e4a7cfa4c019fa1d7c87a53e1298b1a71
Bill Yi [Mon, 18 Sep 2017 20:52:38 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours am:
c49cdb6749 -s ours am:
cda0464f7d -s ours" into oc-mr1-dev-plus-aosp
am:
92b6a2f2da -s ours
Change-Id: Ia83c0e9230bb2136065ba199f274892d88be4607
Bill Yi [Mon, 18 Sep 2017 20:41:03 +0000 (20:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
69ca32dcea -s ours am:
60af01bec9 -s ours am:
728b23a934 -s ours
am:
8bd92a279f -s ours
Change-Id: Id8abbab3a751aa922d892953ecc8754ecfe8c583
Felipe Leme [Mon, 18 Sep 2017 20:37:44 +0000 (20:37 +0000)]
Merge "Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev am:
daf9b2ee15" into oc-mr1-dev-plus-aosp
am:
606f2d1b93
Change-Id: I704f41d28f27c6c1559ab778cd49c35169995fc5
Bill Yi [Mon, 18 Sep 2017 20:33:28 +0000 (20:33 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours am:
c49cdb6749 -s ours am:
d65cbc4442 -s ours
am:
46d9bb98d5 -s ours
Change-Id: Id1d57e614d56ba6829950e83f2243dd44b304925
Bill Yi [Mon, 18 Sep 2017 20:31:42 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
69ca32dcea -s ours am:
60af01bec9 -s ours
am:
6c4c6b047c -s ours
Change-Id: I033bbb7c0fa44047a3d160795f4ef4da5ed8aa92
TreeHugger Robot [Mon, 18 Sep 2017 20:30:53 +0000 (20:30 +0000)]
Merge "[RefactoredBMS] Correct scope of "disabled?" check viz backup/restore decisions"
Android Build Merger (Role) [Mon, 18 Sep 2017 20:27:53 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours am:
c49cdb6749 -s ours am:
cda0464f7d -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Mon, 18 Sep 2017 20:26:07 +0000 (20:26 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours am:
c49cdb6749 -s ours
am:
cda0464f7d -s ours
Change-Id: Iaf01d0652c1f3bf3ea9ed8f635a154f07b47f9d7
Bill Yi [Mon, 18 Sep 2017 20:24:21 +0000 (20:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
69ca32dcea -s ours am:
60af01bec9 -s ours
am:
728b23a934 -s ours
Change-Id: I2d7def5a1bce48ce826a43541e1255a8a4e1e44f
TreeHugger Robot [Mon, 18 Sep 2017 20:21:31 +0000 (20:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Android Build Merger (Role) [Mon, 18 Sep 2017 20:19:10 +0000 (20:19 +0000)]
Merge "Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev am:
daf9b2ee15" into oc-mr1-dev-plus-aosp
Felipe Leme [Mon, 18 Sep 2017 20:17:37 +0000 (20:17 +0000)]
Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev
am:
daf9b2ee15
Change-Id: I5fa55acdf7b8328be82410144155ee019d096c2d
Eino-Ville Talvala [Mon, 18 Sep 2017 20:17:20 +0000 (20:17 +0000)]
Merge "DngCreator: Don't use default locale for writing date/time into DNG" into oc-mr1-dev am:
7c1f9cd750
am:
6e70e977df
Change-Id: I5d482de95a494d73667a6abbea42bf3f5e29c8aa
Bill Yi [Mon, 18 Sep 2017 20:16:43 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
69ca32dcea -s ours
am:
60af01bec9 -s ours
Change-Id: Ib420dbea84af5bec2926bb2abcf804038c977634
Bill Yi [Mon, 18 Sep 2017 20:16:41 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
69ca32dcea -s ours
am:
60af01bec9 -s ours
Change-Id: I920bb3060556824d8185701b10ea71828e242591
Bill Yi [Mon, 18 Sep 2017 20:16:10 +0000 (20:16 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours am:
c49cdb6749 -s ours
am:
d65cbc4442 -s ours
Change-Id: I188322b3a1efdb1dea4fbe3b85f2d749ffffbe45
TreeHugger Robot [Mon, 18 Sep 2017 20:07:18 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 18 Sep 2017 20:07:14 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
69ca32dcea -s ours
Change-Id: I59c5213db2534724e11d0eadf049d9d5489ffa18
Eino-Ville Talvala [Mon, 18 Sep 2017 20:06:43 +0000 (20:06 +0000)]
Merge "DngCreator: Don't use default locale for writing date/time into DNG" into oc-mr1-dev
am:
7c1f9cd750
Change-Id: I4a8dab62082f80452bf3eb003486e5d0febdd820
Bill Yi [Mon, 18 Sep 2017 20:05:45 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours
am:
c49cdb6749 -s ours
Change-Id: Ief5061ef3933b7e1447e235923a52d741fc8fa7e
Bill Yi [Mon, 18 Sep 2017 20:05:44 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours
am:
c49cdb6749 -s ours
Change-Id: I74302ee3485e173533f9ba3bbe26f83d11e1ebe4
Bill Yi [Mon, 18 Sep 2017 19:56:59 +0000 (19:56 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours
am:
456c147827 -s ours
Change-Id: I029764bb19cc295e4749d8974461f6d6be23d5c2
Bill Yi [Mon, 18 Sep 2017 19:48:37 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 18 Sep 2017 19:47:53 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 18 Sep 2017 19:31:18 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Mon, 18 Sep 2017 19:31:00 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 18 Sep 2017 19:30:26 +0000 (19:30 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 18 Sep 2017 19:29:46 +0000 (19:29 +0000)]
Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev
TreeHugger Robot [Mon, 18 Sep 2017 19:20:43 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 18 Sep 2017 19:16:08 +0000 (19:16 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours
am:
fee3748d04 -s ours
Change-Id: I4d666020e912f122850cc140e3f62d65aea029ca
Bill Yi [Mon, 18 Sep 2017 19:12:17 +0000 (12:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I737e49011cb4e2c330c912c2138e29ddaf1d1d42
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Mon, 18 Sep 2017 19:10:11 +0000 (19:10 +0000)]
Merge "DngCreator: Don't use default locale for writing date/time into DNG" into oc-mr1-dev
Bill Yi [Mon, 18 Sep 2017 19:09:21 +0000 (19:09 +0000)]
Import translations. DO NOT MERGE
am:
791ebeed32 -s ours
Change-Id: Iff6d60fe8fd1444c88ffa76634a50a4bb377334d
Selim Cinek [Mon, 18 Sep 2017 18:54:48 +0000 (18:54 +0000)]
Merge "Fixes an issue where the guts could disappear" into oc-mr1-dev am:
6b3501ab91
am:
61282f612d
Change-Id: Icea2de548c1e8a5cd11efa96db446dd13985f5e1
Julia Reynolds [Mon, 18 Sep 2017 18:51:41 +0000 (18:51 +0000)]
Merge "Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours am:
beb14f16fd am:
c13e51f734" into oc-mr1-dev-plus-aosp
am:
d841868feb
Change-Id: Idb571ac087bce60c175b6a54bd52be198bc3c40e
Julia Reynolds [Mon, 18 Sep 2017 18:47:18 +0000 (18:47 +0000)]
Merge "Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours am:
beb14f16fd am:
b35af33888" into oc-mr1-dev-plus-aosp
am:
c1fa919309
Change-Id: I0b976a33fb2347fe9f4cb7c8bfcfdb347172789a
Selim Cinek [Mon, 18 Sep 2017 18:40:09 +0000 (18:40 +0000)]
Merge "Fixes an issue where the guts could disappear" into oc-mr1-dev
am:
6b3501ab91
Change-Id: I3011c9437aac2405c35c93df746a7a865256ab48
fionaxu [Mon, 18 Sep 2017 18:36:44 +0000 (18:36 +0000)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev am:
6e40562a73 -s ours am:
0318d4ec91
am:
ac5aac788b
Change-Id: I0262866304f69250cbf94862e780c791b14a9fe4
Android Build Merger (Role) [Mon, 18 Sep 2017 18:33:11 +0000 (18:33 +0000)]
Merge "Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours am:
beb14f16fd am:
c13e51f734" into oc-mr1-dev-plus-aosp
Selim Cinek [Mon, 18 Sep 2017 18:33:02 +0000 (18:33 +0000)]
Merge "Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev am:
cf6a6d244e" into oc-mr1-dev-plus-aosp
am:
a464532b92
Change-Id: Ifa801951b0d4f02567eaab0ce43f1611b2757c74
Julia Reynolds [Mon, 18 Sep 2017 18:29:29 +0000 (18:29 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours am:
beb14f16fd
am:
c13e51f734
Change-Id: Ibdfe082f03ea9717e9313ca78060b1cc9c50118c
TreeHugger Robot [Mon, 18 Sep 2017 18:28:51 +0000 (18:28 +0000)]
Merge "Use 1MB buffer for install cmds"
Android Build Merger (Role) [Mon, 18 Sep 2017 18:28:48 +0000 (18:28 +0000)]
Merge "Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours am:
beb14f16fd am:
b35af33888" into oc-mr1-dev-plus-aosp
Julia Reynolds [Mon, 18 Sep 2017 18:27:06 +0000 (18:27 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours am:
beb14f16fd
am:
b35af33888
Change-Id: I07fb24843fec304c269c586f29bf4095876bf743
fionaxu [Mon, 18 Sep 2017 18:25:27 +0000 (18:25 +0000)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev am:
6e40562a73 -s ours
am:
0318d4ec91
Change-Id: I78ec7783d47fd5a72c192018e75c0c36fb1a6cdb
Selim Cinek [Mon, 18 Sep 2017 18:24:50 +0000 (18:24 +0000)]
Merge "Fixes an issue where the guts could disappear" into oc-mr1-dev
fionaxu [Mon, 18 Sep 2017 18:22:55 +0000 (18:22 +0000)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev am:
6e40562a73 am:
1a7379d788
am:
be4e433da2
Change-Id: I038f4503d1dd449c48c61785619db57e089519d7
Android Build Merger (Role) [Mon, 18 Sep 2017 18:19:52 +0000 (18:19 +0000)]
Merge "Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev am:
cf6a6d244e" into oc-mr1-dev-plus-aosp
Julia Reynolds [Mon, 18 Sep 2017 18:19:17 +0000 (18:19 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours
am:
beb14f16fd
Change-Id: Icd720ef0e675473039613fe2f77789735f8c559e
Selim Cinek [Mon, 18 Sep 2017 18:17:14 +0000 (18:17 +0000)]
Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev
am:
cf6a6d244e
Change-Id: Ic3ac8d59c56cec95357bbecafa60d2228810e61c
Julia Reynolds [Mon, 18 Sep 2017 18:16:38 +0000 (18:16 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours
am:
beb14f16fd
Change-Id: I4389c9502a6b8dd0224ec4323bbbe2599133de15
fionaxu [Mon, 18 Sep 2017 18:14:50 +0000 (18:14 +0000)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev am:
6e40562a73
am:
1a7379d788
Change-Id: I7c3afba872aa8bcc13c5bbe39f91e50a3c02efe1
Ruina Liu [Mon, 18 Sep 2017 18:13:29 +0000 (18:13 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am:
ac421b8f44 am:
8c65620d31 am:
311d031d22
am:
57a1d7a669
Change-Id: Ia77a11df8f4e4ed64df96b0323c27f8057bd2992
fionaxu [Mon, 18 Sep 2017 18:12:24 +0000 (18:12 +0000)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev
am:
6e40562a73 -s ours
Change-Id: I65b0adc062d2bfc83590b24d04030d01790e5bd7
Julia Reynolds [Mon, 18 Sep 2017 18:09:02 +0000 (18:09 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev
am:
9c32669043 -s ours
Change-Id: I890f0e8e36b5c397365af8d9eb7f84d1d9a7a719
Selim Cinek [Mon, 18 Sep 2017 18:08:29 +0000 (18:08 +0000)]
Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev
Ruina Liu [Mon, 18 Sep 2017 18:06:30 +0000 (18:06 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am:
ac421b8f44 am:
8c65620d31
am:
311d031d22
Change-Id: I151f0dc74bfeca44db6aa0c428f8cfbb8b2d3891
fionaxu [Mon, 18 Sep 2017 18:06:26 +0000 (18:06 +0000)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev
am:
6e40562a73
Change-Id: I804a1cebba2b8fb297bd8dda9a74ae8736334e3b
Ruina Liu [Mon, 18 Sep 2017 18:00:58 +0000 (18:00 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am:
ac421b8f44
am:
8c65620d31
Change-Id: I70ded26f7487e0cf0cbb2f3fa1184c85ed00b765
fionaxu [Fri, 15 Sep 2017 20:52:04 +0000 (13:52 -0700)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Bug:
65113738
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa
Ruina Liu [Mon, 18 Sep 2017 17:53:31 +0000 (17:53 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
am:
ac421b8f44
Change-Id: I9c6b453e0ef71a70cd972a47763d042943fe3f36
Treehugger Robot [Mon, 18 Sep 2017 17:37:26 +0000 (17:37 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
Jason Monk [Mon, 18 Sep 2017 17:37:23 +0000 (17:37 +0000)]
Merge "Refinement of auto-dimming nav" into oc-mr1-dev am:
5b4b6bda2d
am:
ec01a4abb9
Change-Id: Ibfced93a748f3b098fb3e0a9af691b745666f916
TreeHugger Robot [Mon, 18 Sep 2017 17:35:06 +0000 (17:35 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev
Winson Chung [Mon, 18 Sep 2017 17:28:00 +0000 (17:28 +0000)]
Merge "Add low-ram check for PiP support even if feature is enabled." into oc-mr1-dev am:
9448052132
am:
f3a6edbba2
Change-Id: I8053b4f99de86cf966abe52665bafafaf454f3fd
Jason Monk [Mon, 18 Sep 2017 17:27:30 +0000 (17:27 +0000)]
Merge "Refinement of auto-dimming nav" into oc-mr1-dev
am:
5b4b6bda2d
Change-Id: Id986f78ecc87693f0442534875d473c5a0fe16ab
Winson Chung [Mon, 18 Sep 2017 17:17:32 +0000 (17:17 +0000)]
Merge "Add low-ram check for PiP support even if feature is enabled." into oc-mr1-dev
am:
9448052132
Change-Id: I55bc3be04dc14c834f0e6ecd52954d36fad84569
TreeHugger Robot [Mon, 18 Sep 2017 17:13:25 +0000 (17:13 +0000)]
Merge "Refinement of auto-dimming nav" into oc-mr1-dev
Winson Chung [Mon, 18 Sep 2017 17:10:30 +0000 (17:10 +0000)]
Merge "Add low-ram check for PiP support even if feature is enabled." into oc-mr1-dev
Felipe Leme [Mon, 18 Sep 2017 17:04:29 +0000 (17:04 +0000)]
Merge "Minor fixes on WebView.onProvideAutofillVirtualStructure() javadoc." into oc-mr1-dev am:
d96b0d1b47
am:
358f7fdff3
Change-Id: I06636c95b5f4e72f2f344b9f9449a5762813b9ca
Felipe Leme [Mon, 18 Sep 2017 16:58:08 +0000 (16:58 +0000)]
Merge "Minor fixes on WebView.onProvideAutofillVirtualStructure() javadoc." into oc-mr1-dev
am:
d96b0d1b47
Change-Id: Ia209d29b9bd71e4fde44cadf8c5c07c5967f6d47
TreeHugger Robot [Mon, 18 Sep 2017 16:47:40 +0000 (16:47 +0000)]
Merge "Minor fixes on WebView.onProvideAutofillVirtualStructure() javadoc." into oc-mr1-dev
Philip P. Moltmann [Mon, 18 Sep 2017 16:07:04 +0000 (09:07 -0700)]
Use 1MB buffer for install cmds
Similar to Package Installer App. This reduces the overhead of each
chunk and slighly speeds up package installation.
Test: Installed app via 'adb install' and 'adb shell pm install'
Change-Id: Ic8f67087e578bf0696e3d55ad3d7f3892ca2bf90
Charles He [Mon, 18 Sep 2017 16:13:55 +0000 (16:13 +0000)]
Merge "AM: refactor LockTask whitelist update logic."
TreeHugger Robot [Mon, 18 Sep 2017 16:06:22 +0000 (16:06 +0000)]
Merge "Added WindowConfigurationProto and friends"
Michal Karpinski [Mon, 18 Sep 2017 15:07:28 +0000 (16:07 +0100)]
[RefactoredBMS] Correct scope of "disabled?" check viz backup/restore decisions
This CL replicates ag/
2204901 in RefactoredBMS.
Also adjusts tests and adds new ones for appIsDisabled method.
Test: runtest -p com.android.server.backup frameworks-services
Bug:
37973765
Change-Id: Ibaa15ba935ca1ada657e912b18a5a0b3bcffd00f
TreeHugger Robot [Mon, 18 Sep 2017 15:52:44 +0000 (15:52 +0000)]
Merge "[RefactoredBMS] Don't mix "current dataset" tokens for different backup transports"
Bill Yi [Mon, 18 Sep 2017 15:21:35 +0000 (08:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6a56e46644120a42a4a0cff43dfd5f8b61ca6f8f
TreeHugger Robot [Mon, 18 Sep 2017 15:08:09 +0000 (15:08 +0000)]
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
Charles He [Mon, 18 Sep 2017 14:49:02 +0000 (14:49 +0000)]
Merge "Status bar: correctly register disable flags"
Bill Yi [Mon, 18 Sep 2017 14:47:49 +0000 (07:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I990179cc9d80a1a7b6fa5ed2b01a807765c68560
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jason Monk [Mon, 18 Sep 2017 14:31:37 +0000 (10:31 -0400)]
Refinement of auto-dimming nav
- Make dimming only happen for interaction with nav
- Extend time to dim
- Shorten time to start dimming by same amount.
Test: visual
Change-Id: Ieb5b31bacdde9ce1952601ad65cff2d54386dd0f
Fixes:
65694001
TreeHugger Robot [Mon, 18 Sep 2017 14:24:41 +0000 (14:24 +0000)]
Merge "Test that the replace flag does not need to be set"
Wale Ogunwale [Wed, 13 Sep 2017 12:55:07 +0000 (05:55 -0700)]
Added WindowConfigurationProto and friends
Also added WindowContainerProto and ConfigurationContainerProto
Will be used by cts tests in upcoming CLs that replace StackId APIs.
Test: adb shell dumpsys window --proto
Bug:
64146578
Change-Id: Id6ca2a93e3d15ac696ab54cb241870e973985967
TreeHugger Robot [Mon, 18 Sep 2017 14:15:55 +0000 (14:15 +0000)]
Merge "[RefactoredBMS] Offload the mRunningFullBackupTask.handleCancel() call from the main thread to another thread"
TreeHugger Robot [Mon, 18 Sep 2017 14:07:49 +0000 (14:07 +0000)]
Merge "[RefactoredBMS] Add log before doRestoreFinished is called on BackupAgent."
Charles He [Sat, 2 Sep 2017 14:27:16 +0000 (15:27 +0100)]
AM: refactor LockTask whitelist update logic.
Previously, ActivityManagerService owned the LockTask package whitelist,
whereas LockTaskController contained the update logic. In this refactor,
we simplify the structure by moving the whitelist into LockTaskController.
We also add instrumentation tests to verify this behavior.
Test: bit FrameworksServicesTests:com.android.server.am.LockTaskControllerTest
Test: runtest frameworks-services
Test: go/wm-smoke
Test: cts-tradefed run cts-dev -m DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_deviceOwnerUser
Bug:
63909481
Change-Id: I15ef4a446de800336f2bf9cbbd4acf6685e29320
TreeHugger Robot [Mon, 18 Sep 2017 13:53:05 +0000 (13:53 +0000)]
Merge "Ignore only internal volume keys when in VR mode."
Michal Karpinski [Mon, 18 Sep 2017 13:32:42 +0000 (14:32 +0100)]
[RefactoredBMS] Don't mix "current dataset" tokens for different backup transports
This CL replicates ag/
2191170 in RefactoredBMS.
Test: runtest -p com.android.server.backup frameworks-services
Bug:
37973765
Change-Id: Ic3fd528071cef8143e2c3f6b659722f951f0deb9
Charles He [Mon, 18 Sep 2017 08:19:28 +0000 (09:19 +0100)]
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
Michal Karpinski [Mon, 18 Sep 2017 13:15:56 +0000 (14:15 +0100)]
[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
Bill Yi [Mon, 18 Sep 2017 13:05:48 +0000 (06:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6de27d8cd32bfea78284b4cbdfadeca461eb21b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Mon, 18 Sep 2017 13:00:55 +0000 (13:00 +0000)]
Merge changes I3d638a98,I55d18254
* changes:
[RefactoredBMS] Add tracing for UserState and a few services
[RefactoredBMS] Call removeMessages() only for certain operations in RefactoredBackupManagerService#handleCancel()
Bill Yi [Mon, 18 Sep 2017 12:59:51 +0000 (05:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I48971d150b2a7429060bf3e47f96ef39d4cf2bfd
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Mon, 18 Sep 2017 12:52:13 +0000 (05:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia04529216b73a44fcf223ec8d5dc065a634bb6f2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Michal Karpinski [Mon, 18 Sep 2017 12:44:12 +0000 (13:44 +0100)]
[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
Bill Yi [Mon, 18 Sep 2017 12:43:52 +0000 (05:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie06046709594b1da9f21bb5d4734f0a3842325cc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
OSDN Git Service
