OSDN Git Service
Jeff Sharkey [Thu, 29 Mar 2018 21:00:42 +0000 (21:00 +0000)]
Merge "Tidy up users of TRANSPORT constants." into pi-dev am:
407932ebc0
am:
fafc00efbe
Change-Id: I93a3bd0ccb60e387f0adc7759a9aff1365508034
Jeff Sharkey [Thu, 29 Mar 2018 20:55:42 +0000 (20:55 +0000)]
Merge "Switch reference time to ZonedDateTime" into pi-dev am:
50ac4d2c60
am:
69258db6ed
Change-Id: I217365cefe9ce1283d122e8688b479112c5ac605
Calin Juravle [Thu, 29 Mar 2018 20:41:46 +0000 (20:41 +0000)]
Merge "Add the compilation reason to the dexopt dumps" into pi-dev am:
709bfc2cdd
am:
95fc5084dc
Change-Id: I94de6c63ab5446bfccff8999da3a85fad2dde427
Bookatz [Thu, 29 Mar 2018 20:29:28 +0000 (20:29 +0000)]
Merge "Update BleScanStateChanged comment" into pi-dev am:
d82ece9ec8
am:
ab887d70bc
Change-Id: Ib0868dd76513cd52e1acd38057dda9df96c1dcdd
jovanak [Thu, 29 Mar 2018 20:22:59 +0000 (20:22 +0000)]
Merge "Bouncer should not show over the full screen user switcher on boot." into pi-dev am:
9ed9aa932e
am:
0a1921b5a6
Change-Id: Ia1228963411f4821040839457627805020443e2d
Jorim Jaggi [Thu, 29 Mar 2018 20:14:59 +0000 (20:14 +0000)]
Merge "Fix letterbox insets when starting app" into pi-dev am:
1a6051a81d
am:
8470ad6e4c
Change-Id: I2f2a42ef96f028a4f8f5a09bf09f09b8b3f5bef4
Adrian Roos [Thu, 29 Mar 2018 20:05:53 +0000 (20:05 +0000)]
Merge "RemoteAnimations: Add failsafe" into pi-dev am:
a685503741
am:
af76f5eb12
Change-Id: Ib74da8c57746adc47846796995c5ba024f12f995
Jeff Sharkey [Thu, 29 Mar 2018 19:53:26 +0000 (19:53 +0000)]
Merge "Tidy up users of TRANSPORT constants." into pi-dev
am:
407932ebc0
Change-Id: I31a611736b4b939edc01eb4d533a3587d3d27b76
Jeff Sharkey [Thu, 29 Mar 2018 19:46:28 +0000 (19:46 +0000)]
Merge "Switch reference time to ZonedDateTime" into pi-dev
am:
50ac4d2c60
Change-Id: Idf036bc9772d5b4d04cc568bc0daf5f91b91ecc9
Felipe Leme [Thu, 29 Mar 2018 19:42:09 +0000 (19:42 +0000)]
Merge "Improved documentation of AutofillFieldClassificationService.onGetScores()" into pi-dev am:
7516514148
am:
523388559a
Change-Id: Iaeb0422f305956efa1843eaa18b0429ecbadc320
Calin Juravle [Thu, 29 Mar 2018 19:39:57 +0000 (19:39 +0000)]
Merge "Add the compilation reason to the dexopt dumps" into pi-dev
am:
709bfc2cdd
Change-Id: I44cb35ba63747e80ad07951972d0c97a3da2df88
Bookatz [Thu, 29 Mar 2018 19:29:25 +0000 (19:29 +0000)]
Merge "Update BleScanStateChanged comment" into pi-dev
am:
d82ece9ec8
Change-Id: I6cc114caaa4c0cc70bfa208af8bf3e16e4d18c1b
Cassie [Thu, 29 Mar 2018 19:29:05 +0000 (19:29 +0000)]
Merge "[automerger skipped] Merge "Move alpha long/short to the base CellIdentity according API Review." am:
b57de56276 am:
a2a3815e5b -s ours" into pi-dev-plus-aosp
am:
0fa5e95765 -s ours
Change-Id: I0bc3f370d164e08dfd101b8dbfd97d037be24d8d
Jeff Sharkey [Thu, 29 Mar 2018 19:23:38 +0000 (19:23 +0000)]
Merge "Tidy up users of TRANSPORT constants." into pi-dev
John Reck [Thu, 29 Mar 2018 19:23:23 +0000 (19:23 +0000)]
Merge "Change shader precision because of CTS Fail."
jovanak [Thu, 29 Mar 2018 19:23:10 +0000 (19:23 +0000)]
Merge "Bouncer should not show over the full screen user switcher on boot." into pi-dev
am:
9ed9aa932e
Change-Id: I91c89dfaef256bd9cacabc5444f29e53bb92c04e
Jeff Sharkey [Thu, 29 Mar 2018 19:22:47 +0000 (19:22 +0000)]
Merge "Switch reference time to ZonedDateTime" into pi-dev
Jorim Jaggi [Thu, 29 Mar 2018 19:16:50 +0000 (19:16 +0000)]
Merge "Fix letterbox insets when starting app" into pi-dev
am:
1a6051a81d
Change-Id: Ie5f6f6a1372bf6a563a700a74a6fcc41325e616c
Calin Juravle [Thu, 29 Mar 2018 19:15:44 +0000 (19:15 +0000)]
Merge "Add the compilation reason to the dexopt dumps" into pi-dev
Cassie [Thu, 29 Mar 2018 19:08:21 +0000 (19:08 +0000)]
[automerger skipped] Merge "Move alpha long/short to the base CellIdentity according API Review." am:
b57de56276 am:
a2a3815e5b -s ours
am:
a614bc9976 -s ours
Change-Id: Ifd10b422b974c07db8b363dbac431f2547433161
TreeHugger Robot [Thu, 29 Mar 2018 19:05:19 +0000 (19:05 +0000)]
Merge "Update BleScanStateChanged comment" into pi-dev
Adrian Roos [Thu, 29 Mar 2018 18:51:19 +0000 (18:51 +0000)]
Merge "RemoteAnimations: Add failsafe" into pi-dev
am:
a685503741
Change-Id: Id5cf196c8da0a8823061d8ae85f42f2cca929790
Anton Philippov [Thu, 29 Mar 2018 18:49:41 +0000 (18:49 +0000)]
Merge "Add FLAG_INCREMENTAL support to LocalTransport." into pi-dev am:
eed025c570
am:
3488f863be
Change-Id: Ib1e25525f87ec412c52e01d62a26a9661a85c4c8
Felipe Leme [Thu, 29 Mar 2018 18:42:42 +0000 (18:42 +0000)]
Merge "Improved documentation of AutofillFieldClassificationService.onGetScores()" into pi-dev
am:
7516514148
Change-Id: I38431d9dad8b7215f80c2243389dbff61bc4a1c0
Andrii Kulian [Thu, 29 Mar 2018 18:42:29 +0000 (18:42 +0000)]
Merge "Prefer default orientation for secondary displays" into pi-dev am:
a22cca47e2
am:
07a913217a
Change-Id: I49cf68d3bd6db4846eabed1cb0bf25987dbe7b66
TreeHugger Robot [Thu, 29 Mar 2018 18:28:12 +0000 (18:28 +0000)]
Merge "Bouncer should not show over the full screen user switcher on boot." into pi-dev
Tomasz Wasilczyk [Thu, 29 Mar 2018 18:25:09 +0000 (18:25 +0000)]
Merge "Indicate whether BandConfig initialization is required or not." into pi-dev am:
64faa5b60f
am:
1ee1809190
Change-Id: I9713bb3982d0c44544b24a5fa89fee1b7d5483e8
Android Build Merger (Role) [Thu, 29 Mar 2018 18:23:47 +0000 (18:23 +0000)]
Merge "[automerger skipped] Merge "Move alpha long/short to the base CellIdentity according API Review." am:
b57de56276 am:
a2a3815e5b -s ours" into pi-dev-plus-aosp
Cassie [Thu, 29 Mar 2018 18:23:08 +0000 (18:23 +0000)]
[automerger skipped] Merge "Move alpha long/short to the base CellIdentity according API Review." am:
b57de56276
am:
a2a3815e5b -s ours
Change-Id: I7799e0425585ed40bb6a7f27f299eb993773c50c
Anton Philippov [Thu, 29 Mar 2018 18:22:26 +0000 (18:22 +0000)]
Merge "Add FLAG_INCREMENTAL support to LocalTransport." into pi-dev
am:
eed025c570
Change-Id: Ie3e66979f253bb621b7897cd687b0b2d5cd00de0
TreeHugger Robot [Thu, 29 Mar 2018 18:22:22 +0000 (18:22 +0000)]
Merge "Changed AAPT2 to abide by AAPT resource whitespace triming."
Jorim Jaggi [Thu, 29 Mar 2018 18:21:29 +0000 (18:21 +0000)]
Merge "Fix letterbox insets when starting app" into pi-dev
Makoto Onuki [Thu, 29 Mar 2018 18:11:44 +0000 (18:11 +0000)]
Merge "Root (uid=0) should be core. Fix UserHandle.isCore()." into pi-dev am:
f3faf62adc
am:
aad3482cc4
Change-Id: I8d24943abd41120d5aa73f369fc64b9d89e5fd30
Cassie [Thu, 29 Mar 2018 18:11:34 +0000 (18:11 +0000)]
Merge "Move alpha long/short to the base CellIdentity according API Review."
am:
b57de56276
Change-Id: I088b1751c63f6b21c8452a07649751ac0b9989e5
Adrian Roos [Thu, 29 Mar 2018 18:10:28 +0000 (18:10 +0000)]
Merge "RemoteAnimations: Add failsafe" into pi-dev
Andrii Kulian [Thu, 29 Mar 2018 18:06:58 +0000 (18:06 +0000)]
Merge "Prefer default orientation for secondary displays" into pi-dev
am:
a22cca47e2
Change-Id: I67ba66682a656008eff8c6828c7f56141de5a666
TreeHugger Robot [Thu, 29 Mar 2018 18:00:55 +0000 (18:00 +0000)]
Merge "Improved documentation of AutofillFieldClassificationService.onGetScores()" into pi-dev
Tomasz Wasilczyk [Thu, 29 Mar 2018 18:00:30 +0000 (18:00 +0000)]
Merge "Indicate whether BandConfig initialization is required or not." into pi-dev
am:
64faa5b60f
Change-Id: I10673d4d00ad323c0c8e8d697249e8f79650b325
Anton Philippov [Thu, 29 Mar 2018 17:54:52 +0000 (17:54 +0000)]
Merge "Add FLAG_INCREMENTAL support to LocalTransport." into pi-dev
Makoto Onuki [Thu, 29 Mar 2018 17:53:30 +0000 (17:53 +0000)]
Merge "Root (uid=0) should be core. Fix UserHandle.isCore()." into pi-dev
am:
f3faf62adc
Change-Id: Ie4af59f3892be89adfcdbe9a0cb02e92aab2c8b2
Chenjie Yu [Thu, 29 Mar 2018 17:52:34 +0000 (17:52 +0000)]
Merge "Fix StatsCompanionService pull on bucket ends" into pi-dev am:
925a04b775
am:
985270a6a0
Change-Id: I12709668687d1646a1db949b612114af78311592
John Reck [Thu, 29 Mar 2018 17:34:00 +0000 (17:34 +0000)]
Merge "Move Path to NAR" into pi-dev am:
9434b66bf7
am:
6541c42146
Change-Id: I6cf9880e75ade2430af26eda7d9777ce81250168
Chenjie Yu [Thu, 29 Mar 2018 17:33:18 +0000 (17:33 +0000)]
Merge "Fix StatsCompanionService pull on bucket ends" into pi-dev
am:
925a04b775
Change-Id: I1aac27b4a83158b336e0fcff16a18a06ab310615
Andrii Kulian [Thu, 29 Mar 2018 17:32:57 +0000 (17:32 +0000)]
Merge "Prefer default orientation for secondary displays" into pi-dev
Tomasz Wasilczyk [Thu, 29 Mar 2018 17:27:56 +0000 (17:27 +0000)]
Merge "Indicate whether BandConfig initialization is required or not." into pi-dev
Amin Shaikh [Thu, 29 Mar 2018 17:27:32 +0000 (17:27 +0000)]
Merge "Change alarm/ringer status QS separator." into pi-dev am:
2011f2333d
am:
1110355fb3
Change-Id: I8ae4c1eca49060de23537470d7ecc179ec70c426
John Reck [Thu, 29 Mar 2018 17:18:13 +0000 (17:18 +0000)]
Merge "Move Path to NAR" into pi-dev
am:
9434b66bf7
Change-Id: I693153af6cdd6face8aae7cc1cd6c828fc774b78
TreeHugger Robot [Thu, 29 Mar 2018 17:17:23 +0000 (17:17 +0000)]
Merge "Root (uid=0) should be core. Fix UserHandle.isCore()." into pi-dev
Greg Kaiser [Thu, 29 Mar 2018 17:14:32 +0000 (17:14 +0000)]
Merge "tools/bit: Avoid leak in error condition" am:
db43124b01 am:
b3851d92ce
am:
739d7864e3
Change-Id: I2ba292aade2c3612b4876af099b9b72fffb45db2
Robert Berry [Thu, 29 Mar 2018 17:02:51 +0000 (17:02 +0000)]
Merge "Save KeyChainSnapshots to disk" into pi-dev am:
02c0bbdc47
am:
0eb805463a
Change-Id: I9c922b94701eee213646a6ca3a2c4488959e5ce1
Amin Shaikh [Thu, 29 Mar 2018 17:02:33 +0000 (17:02 +0000)]
Merge "Change alarm/ringer status QS separator." into pi-dev
am:
2011f2333d
Change-Id: I8603604b163bd901d902f0bf1a0a2d47bdf35a05
TreeHugger Robot [Thu, 29 Mar 2018 17:00:25 +0000 (17:00 +0000)]
Merge "Fix StatsCompanionService pull on bucket ends" into pi-dev
Greg Kaiser [Thu, 29 Mar 2018 16:57:00 +0000 (16:57 +0000)]
Merge "tools/bit: Avoid leak in error condition" am:
db43124b01
am:
b3851d92ce
Change-Id: I6b51d22ee200e11b5a731461f295f5da8937a683
John Reck [Thu, 29 Mar 2018 16:53:41 +0000 (16:53 +0000)]
Merge "Move Path to NAR" into pi-dev
David Brazdil [Thu, 29 Mar 2018 16:51:34 +0000 (16:51 +0000)]
Merge "Add more hidden API uses to light greylist" into pi-dev am:
1b460069a1
am:
e32515f19f
Change-Id: I616f9065fd0a1c5758239714afda92875876254f
TreeHugger Robot [Thu, 29 Mar 2018 16:50:21 +0000 (16:50 +0000)]
Merge "Change alarm/ringer status QS separator." into pi-dev
Robert Berry [Thu, 29 Mar 2018 16:46:48 +0000 (16:46 +0000)]
Merge "Save KeyChainSnapshots to disk" into pi-dev
am:
02c0bbdc47
Change-Id: I603452c6ea44eec44d5c03fab4130034acc7d11d
Treehugger Robot [Thu, 29 Mar 2018 16:45:52 +0000 (16:45 +0000)]
Merge "Move alpha long/short to the base CellIdentity according API Review."
Greg Kaiser [Thu, 29 Mar 2018 16:45:00 +0000 (16:45 +0000)]
Merge "tools/bit: Avoid leak in error condition"
am:
db43124b01
Change-Id: I4ab166872dc985c98d4771d4715a0d059de80dd7
Android Build Merger (Role) [Thu, 29 Mar 2018 16:44:30 +0000 (16:44 +0000)]
Merge "Merge "NotificationManagerService: don't play notif in SILENT mode" into pi-dev am:
a908ec2a36 am:
0babc73c89"
Jean-Michel Trivi [Thu, 29 Mar 2018 16:44:06 +0000 (16:44 +0000)]
Merge "NotificationManagerService: don't play notif in SILENT mode" into pi-dev am:
a908ec2a36
am:
0babc73c89
Change-Id: Id8ebc2d9e2d0abefe0fb02f42a5e6528a9c2a7c4
Chet Haase [Thu, 29 Mar 2018 16:43:16 +0000 (16:43 +0000)]
Merge "Fix bug and docs assuming progressBar min is 0 instead of getMin()"
Jan Althaus [Thu, 29 Mar 2018 15:51:57 +0000 (17:51 +0200)]
Switch reference time to ZonedDateTime
Bug:
74838195
Test: atest FrameworksCoreTests:TextClassificationManagerTest
Test: atest FrameworksCoreTests:TextClassificationTest
Test: atest CtsViewTestCases:TextClassificationManagerTest
Test: atest CtsViewTestCases:TextClassifierValueObjectsTest
Change-Id: I0df9dddf415fa558435553336a8a0a15621e9b05
David Brazdil [Thu, 29 Mar 2018 16:36:35 +0000 (16:36 +0000)]
Merge "Add more hidden API uses to light greylist" into pi-dev
am:
1b460069a1
Change-Id: Id9ac8e2d05df7d679a970cc04f066554f5f09954
Felipe Leme [Thu, 29 Mar 2018 16:30:36 +0000 (16:30 +0000)]
Merge "Don't print contents of user-provided bundles." into pi-dev am:
dac0fe910a
am:
7c6e950075
Change-Id: Ibd0e02676e3745edc0e4c1866dddb45e0db7670a
Robert Berry [Thu, 29 Mar 2018 16:27:42 +0000 (16:27 +0000)]
Merge "Save KeyChainSnapshots to disk" into pi-dev
Jean-Michel Trivi [Thu, 29 Mar 2018 16:26:07 +0000 (16:26 +0000)]
Merge "NotificationManagerService: don't play notif in SILENT mode" into pi-dev
am:
a908ec2a36
Change-Id: I186b0b920560bc484b6f4ebea6e4112f3ad06d5c
TreeHugger Robot [Thu, 29 Mar 2018 16:22:47 +0000 (16:22 +0000)]
Merge "Add more hidden API uses to light greylist" into pi-dev
Jeff Sharkey [Thu, 29 Mar 2018 16:18:04 +0000 (16:18 +0000)]
Merge "Better public volumes handling on secondary users." into pi-dev am:
4abf0f708f
am:
9e6836d7b7
Change-Id: I12457a332701efd588cbff628fe50af32ab9880d
Jean-Michel Trivi [Thu, 29 Mar 2018 16:14:10 +0000 (16:14 +0000)]
Merge "NotificationManagerService: don't play notif in SILENT mode" into pi-dev
Felipe Leme [Thu, 29 Mar 2018 16:07:46 +0000 (16:07 +0000)]
Merge "Don't print contents of user-provided bundles." into pi-dev
am:
dac0fe910a
Change-Id: I2abc3adc142b7ad4c4cc25e3a382d53cecec5002
Ryan Mitchell [Thu, 29 Mar 2018 01:22:57 +0000 (18:22 -0700)]
Changed AAPT2 to abide by AAPT resource whitespace triming.
Bug: b/
74331008
Test: Created tests in ResourceParser_test.cpp
Change-Id: Id7b387692b795774cd77452ca8cf06a8447bf3be
Jeff Sharkey [Thu, 29 Mar 2018 15:59:19 +0000 (15:59 +0000)]
Merge "API for granting/revoking runtime permissions." into pi-dev am:
c8156c6a52
am:
0ec31b56e9
Change-Id: Ic18363622c687e09aa6b55c1efa6ed14acdcfb06
Anton Philippov [Mon, 26 Mar 2018 18:12:08 +0000 (19:12 +0100)]
Add FLAG_INCREMENTAL support to LocalTransport.
Implement performBackup() with flags argument:
1. If FLAG_INCREMENTAL is passed and transport has no data for this
package or supports only non-incremental backups, request a non-incremental retry.
2. If FLAG_NON_INCREMENTAL is passed, but transport has data, discard
that data and continue.
Bug:
72212840
Test: GTS test in the same topic
Change-Id: I4c4a1dbfa1a807e4d4c523f42bb6a404a39731e9
Jeff Sharkey [Thu, 29 Mar 2018 15:56:02 +0000 (15:56 +0000)]
Merge "Better public volumes handling on secondary users." into pi-dev
am:
4abf0f708f
Change-Id: Ibf736f62f884b2effc663b059ab4c692d71fffff
Jeff Sharkey [Thu, 29 Mar 2018 15:45:33 +0000 (15:45 +0000)]
Merge "API for granting/revoking runtime permissions." into pi-dev
am:
c8156c6a52
Change-Id: Ied3764b365ce6e59848042fff2efd748bde3d9ca
Eran Messeri [Thu, 29 Mar 2018 15:37:34 +0000 (15:37 +0000)]
Merge "DPM: API review for installKeyPair" into pi-dev am:
e5f9e833e5
am:
da707fa021
Change-Id: I251deb9315fcfad23dde6f27ac2733cb422f4233
TreeHugger Robot [Thu, 29 Mar 2018 15:36:43 +0000 (15:36 +0000)]
Merge "Don't print contents of user-provided bundles." into pi-dev
Treehugger Robot [Thu, 29 Mar 2018 15:22:55 +0000 (15:22 +0000)]
Merge "tools/bit: Avoid leak in error condition"
Eran Messeri [Thu, 29 Mar 2018 15:22:41 +0000 (15:22 +0000)]
Merge "DPM: API review for installKeyPair" into pi-dev
am:
e5f9e833e5
Change-Id: Ia10366dca584cd9d92932f2dfd3cd59472ee078c
Alan Viverette [Thu, 29 Mar 2018 15:20:00 +0000 (15:20 +0000)]
Merge "Federate platform docs against AndroidX" into pi-dev am:
73a66276e3
am:
55d013b0fa
Change-Id: Ia5aa4f1c134f1328105a9e13df6d470b3f2efaaa
Jeff Sharkey [Thu, 29 Mar 2018 15:15:54 +0000 (15:15 +0000)]
Merge "Better public volumes handling on secondary users." into pi-dev
Jeff Sharkey [Thu, 29 Mar 2018 15:14:34 +0000 (15:14 +0000)]
Merge "API for granting/revoking runtime permissions." into pi-dev
Tony Mak [Thu, 29 Mar 2018 15:11:34 +0000 (15:11 +0000)]
Merge "Not allow shell to dump screen by using ui-automator if... DISALLOW_DEBUGGING_FEATURES is set" into pi-dev am:
b2c4a55405
am:
5351429200
Change-Id: I65a7c29f4b7a031bd931d5b31192456734e9616d
Alan Viverette [Thu, 29 Mar 2018 15:04:15 +0000 (15:04 +0000)]
Merge "Federate platform docs against AndroidX" into pi-dev
am:
73a66276e3
Change-Id: I037ae591cb7fbdf33260ff7494a28a0ae22919c1
Eran Messeri [Thu, 29 Mar 2018 15:00:30 +0000 (15:00 +0000)]
Merge "DPM: API review for installKeyPair" into pi-dev
Julia Reynolds [Thu, 29 Mar 2018 14:58:16 +0000 (14:58 +0000)]
Merge "Allow apps with dnd access to bypass DND" into pi-dev am:
0cdeb11c2c
am:
1d434bcf3c
Change-Id: I0ebb0aa2b858be1b0aacb8d3d0175b9bfe7bc47f
Tony Mak [Thu, 29 Mar 2018 14:52:21 +0000 (14:52 +0000)]
Merge "Not allow shell to dump screen by using ui-automator if... DISALLOW_DEBUGGING_FEATURES is set" into pi-dev
am:
b2c4a55405
Change-Id: I7dab7f606d55f1c0e0683edfd16a274a2b481b10
Alan Viverette [Thu, 29 Mar 2018 14:47:47 +0000 (14:47 +0000)]
Merge "Federate platform docs against AndroidX" into pi-dev
Nicolas Geoffray [Thu, 29 Mar 2018 14:47:09 +0000 (14:47 +0000)]
Merge "Add three more wifi APIs." into pi-dev am:
ba6539382a
am:
727492b539
Change-Id: I96aadaddbc5fec9588827f589b3ad7205ef09b07
Tomasz Wasilczyk [Tue, 27 Mar 2018 20:28:42 +0000 (13:28 -0700)]
Indicate whether BandConfig initialization is required or not.
The broadcastradio HAL 1.x requires waiting for onConfigChanged callback
to indicate the initialization is done, while HAL 2.0 does not have the
config setting (at the tuner session level) at all.
This change makes it possible to cleanly workaround race condition in the
radio app retaining support for both HAL revisions. Future versions of the
RadioManager will provide a method to open a session without taking care
about these nuances.
Bug:
74353024
Test: manual
Change-Id: I5de2d5e5c33626fcf0cfbbaf121d0b13e53d0bae
Julia Reynolds [Thu, 29 Mar 2018 14:42:53 +0000 (14:42 +0000)]
Merge "Allow apps with dnd access to bypass DND" into pi-dev
am:
0cdeb11c2c
Change-Id: I4f82ff5b359521c8c6ff8c7b89ee27522cfa7745
Tony Mak [Thu, 29 Mar 2018 14:36:55 +0000 (14:36 +0000)]
Merge "Not allow shell to dump screen by using ui-automator if... DISALLOW_DEBUGGING_FEATURES is set" into pi-dev
Nicolas Geoffray [Thu, 29 Mar 2018 14:35:50 +0000 (14:35 +0000)]
Merge "Add three more wifi APIs." into pi-dev
am:
ba6539382a
Change-Id: Ifa37e895756fa30faa20fc6284375e3c22a2810c
Jorim Jaggi [Wed, 28 Mar 2018 16:01:22 +0000 (18:01 +0200)]
Fix letterbox insets when starting app
Showing the letterbox with checking on HAS_DRAWN is too late. We
also need to show it in READY_TO_SHOW such that we have it
available when starting the transition.
Test: Open letterboxed app. Observe no flicker
Test: Capture winscope trace and make sure content insets when
reopening app are correct.
Bug:
76220728
Change-Id: I20ed8b1b5a90cc0a878d3eb1512e1aa1e4cd37f3
TreeHugger Robot [Thu, 29 Mar 2018 14:27:19 +0000 (14:27 +0000)]
Merge "Allow apps with dnd access to bypass DND" into pi-dev
Nicolas Geoffray [Thu, 29 Mar 2018 14:23:10 +0000 (14:23 +0000)]
Merge "Add three more wifi APIs." into pi-dev
Robert Berry [Thu, 29 Mar 2018 14:19:49 +0000 (14:19 +0000)]
Merge "Remove unused KeyStore field in RecoverableKeyStoreManager" into pi-dev am:
87860048bd
am:
f99fcd3157
Change-Id: I68de5aa7db935ecec247a6a3c0dce0c1c8657b82
Robert Berry [Thu, 29 Mar 2018 14:09:53 +0000 (14:09 +0000)]
Merge "Remove unused KeyStore field in RecoverableKeyStoreManager" into pi-dev
am:
87860048bd
Change-Id: I0439e8675276f9168fd16d318d81547e9596b472
Eran Messeri [Thu, 29 Mar 2018 14:07:32 +0000 (14:07 +0000)]
Merge "Utilize verbose KeyChain errors" into pi-dev am:
8e07a26233
am:
f4dfc116a1
Change-Id: I0754008088afc7bd1600247f583f339f2a3a040b