OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Ensure colors for active permission icons" into pi-dev
Julia Reynolds [Wed, 11 Apr 2018 02:49:55 +0000 (19:49 -0700)]
Merge "Ensure colors for active permission icons" into pi-dev
am: 46d03c2914

Change-Id: I10b3e82a207d542a4761687c08927841eba09ba5

6 years agoMerge "Enable additional logging for recents/remote animations" into pi-dev
Winson Chung [Wed, 11 Apr 2018 02:39:09 +0000 (19:39 -0700)]
Merge "Enable additional logging for recents/remote animations" into pi-dev
am: 57dea8823b

Change-Id: Ieac905265a6b6fd60f0362cb60766414656c6912

6 years agoMerge "Fix NPE when calling Session#addToDisplayWithoutInputChannel" into pi-dev
Daichi Hirono [Wed, 11 Apr 2018 02:33:42 +0000 (19:33 -0700)]
Merge "Fix NPE when calling Session#addToDisplayWithoutInputChannel" into pi-dev
am: ce5e4ed111

Change-Id: I8a5e94996f16a171df28d7a226bbd57bf62d8936

6 years agoMerge "Shelf alignment and animation fixes" into pi-dev
Lucas Dupin [Wed, 11 Apr 2018 02:28:37 +0000 (19:28 -0700)]
Merge "Shelf alignment and animation fixes" into pi-dev
am: 258c743697

Change-Id: Ic39ca931edf9c0da6925e9572b4660e08ca5f180

6 years agoMerge "Notify a11y when view attached to parent" into pi-dev
Phil Weaver [Wed, 11 Apr 2018 02:23:08 +0000 (19:23 -0700)]
Merge "Notify a11y when view attached to parent" into pi-dev
am: 7a65c44d03

Change-Id: I639f9133b5a10003b44f4a4e78894042a3adaa03

6 years agoMerge "Ensure colors for active permission icons" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 02:22:01 +0000 (02:22 +0000)]
Merge "Ensure colors for active permission icons" into pi-dev

6 years agoMerge "Enable additional logging for recents/remote animations" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 02:10:29 +0000 (02:10 +0000)]
Merge "Enable additional logging for recents/remote animations" into pi-dev

6 years agoMerge "Fix NPE when calling Session#addToDisplayWithoutInputChannel" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 02:08:32 +0000 (02:08 +0000)]
Merge "Fix NPE when calling Session#addToDisplayWithoutInputChannel" into pi-dev

6 years agoMerge "Shelf alignment and animation fixes" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 02:01:27 +0000 (02:01 +0000)]
Merge "Shelf alignment and animation fixes" into pi-dev

6 years agoMerge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev
Jason Monk [Wed, 11 Apr 2018 01:58:45 +0000 (18:58 -0700)]
Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev
am: 3c33d2b997

Change-Id: I5afdd7f0a7e00de6305b3a930bf432a351df8d7b

6 years agoMerge "Notify a11y when view attached to parent" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 01:49:57 +0000 (01:49 +0000)]
Merge "Notify a11y when view attached to parent" into pi-dev

6 years agoMerge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 01:47:08 +0000 (01:47 +0000)]
Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev

6 years agoMerge "Add metrics to track auto-brightness settings visibility" into pi-dev
Fan Zhang [Wed, 11 Apr 2018 01:40:19 +0000 (18:40 -0700)]
Merge "Add metrics to track auto-brightness settings visibility" into pi-dev
am: 59de5ca1c0

Change-Id: I8770c2985b7d77493e72ed091d25e6af03c64317

6 years agoMerge "Adding a compatibility implementation for WindowCallbacks" into pi-dev
Sunny Goyal [Wed, 11 Apr 2018 01:29:38 +0000 (18:29 -0700)]
Merge "Adding a compatibility implementation for WindowCallbacks" into pi-dev
am: 358840b0cb

Change-Id: Iea7f86fd71d63a8ceb7685b0051589b4afb2a8ea

6 years agoMerge "Add metrics to track auto-brightness settings visibility" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 01:28:33 +0000 (01:28 +0000)]
Merge "Add metrics to track auto-brightness settings visibility" into pi-dev

6 years agoMerge "Adding a compatibility implementation for WindowCallbacks" into pi-dev
Sunny Goyal [Wed, 11 Apr 2018 01:19:48 +0000 (01:19 +0000)]
Merge "Adding a compatibility implementation for WindowCallbacks" into pi-dev

6 years agoMerge "Drop value if the bucket is totally tainted" into pi-dev
Chenjie Yu [Wed, 11 Apr 2018 01:01:53 +0000 (18:01 -0700)]
Merge "Drop value if the bucket is totally tainted" into pi-dev
am: 5bc03014c0

Change-Id: I92b47ad538eeec38fbf4b4d7211dc75ebf903880

6 years agoMerge "Drop value if the bucket is totally tainted" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 00:45:00 +0000 (00:45 +0000)]
Merge "Drop value if the bucket is totally tainted" into pi-dev

6 years agoList<SliceSpec> -> Set<SliceSpec>
Jason Monk [Thu, 8 Mar 2018 16:31:26 +0000 (11:31 -0500)]
List<SliceSpec> -> Set<SliceSpec>

Test: update-api
Bug: 73123786
Change-Id: I5668023eda0efcadf40a20259a92624e6680659f

6 years agoEnable additional logging for recents/remote animations
Winson Chung [Mon, 9 Apr 2018 22:41:03 +0000 (15:41 -0700)]
Enable additional logging for recents/remote animations

Bug: 73188263
Test: Just logging

Change-Id: I178ed902ad7097cc97fdec6d1c74603cb580453a

6 years agoMerge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev
Jason Monk [Wed, 11 Apr 2018 00:14:38 +0000 (17:14 -0700)]
Merge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev
am: 9107b53c6d

Change-Id: I392e8d905457bcd11a7d83bc330d992636e9e407

6 years agoMerge "Logd retry throttling." into pi-dev
Yangster-mac [Wed, 11 Apr 2018 00:08:41 +0000 (17:08 -0700)]
Merge "Logd retry throttling." into pi-dev
am: 3ed866222d

Change-Id: Id8ef2c9086f0cbfa69d157d8abb8c891c07fec3d

6 years agoMerge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev
Jason Monk [Wed, 11 Apr 2018 00:00:26 +0000 (00:00 +0000)]
Merge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev

6 years agoRevert "List<SliceSpec> -> Set<SliceSpec>"
Jason Monk [Tue, 10 Apr 2018 23:59:14 +0000 (23:59 +0000)]
Revert "List<SliceSpec> -> Set<SliceSpec>"

This reverts commit e2a04b3ea41ebec00afe50db89846920235f23cf.

Bug: 73123786
Change-Id: I1f09893fb3c68650340495f2833eb678099a895f

6 years agoMerge "Logd retry throttling." into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 23:55:06 +0000 (23:55 +0000)]
Merge "Logd retry throttling." into pi-dev

6 years agoMerge "Allow CTS tests to access more from KeyProtection" into pi-dev
Brian C. Young [Tue, 10 Apr 2018 23:54:06 +0000 (16:54 -0700)]
Merge "Allow CTS tests to access more from KeyProtection" into pi-dev
am: de9d071fc1

Change-Id: I39fb214a71a3d84dedccf2ce42e9b19eeeb07542

6 years agoMerge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev
Jason Monk [Tue, 10 Apr 2018 23:48:47 +0000 (16:48 -0700)]
Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev
am: ae42e1d0c2

Change-Id: I4b5af94ddc84fd7c49b13bc6e072f4cba345d882

6 years agoMerge "Allow CTS tests to access more from KeyProtection" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 23:36:12 +0000 (23:36 +0000)]
Merge "Allow CTS tests to access more from KeyProtection" into pi-dev

6 years agoMerge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev
Jason Monk [Tue, 10 Apr 2018 23:23:43 +0000 (23:23 +0000)]
Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev

6 years agoAdding a compatibility implementation for WindowCallbacks
Sunny Goyal [Tue, 10 Apr 2018 23:18:16 +0000 (16:18 -0700)]
Adding a compatibility implementation for WindowCallbacks

Test: Verified the library with launcher changes
Bug: 77695434
Change-Id: Id1c051896b542cb582c778c7c7709191f7a7957f

6 years agoAllow CTS tests to access more from KeyProtection
Brian C. Young [Tue, 10 Apr 2018 15:43:53 +0000 (08:43 -0700)]
Allow CTS tests to access more from KeyProtection

Add @TestApi to allow CTS tests to use that call.
Encryption and decryption are reversed in some documentation.

Test: CtsKeystoreTestCases
Bug: 77596526
Change-Id: Ifaf8b3fa0e231eef256451a2514219fff1b16699

6 years agoShelf alignment and animation fixes
Lucas Dupin [Tue, 10 Apr 2018 00:25:04 +0000 (17:25 -0700)]
Shelf alignment and animation fixes

- Translate shelf after collapsing notification panel
- Fix issue where icon y translation would be off in AOD

Change-Id: Ibae5e7cd4cb989514a96d5edfd761b0c0201de03
Fixes: 77540062
Fixes: 77541059
Test: visual

6 years agoMerge "Update getIccAuthentication documentation" into pi-dev
Jordan Liu [Tue, 10 Apr 2018 22:37:08 +0000 (15:37 -0700)]
Merge "Update getIccAuthentication documentation" into pi-dev
am: ae4518c736

Change-Id: I4f06b912bf68a5dea611cb12ebcffd71a8fae7e8

6 years agoMerge "hwui/debug: Remove glMultiDrawElementsBaseVertexOES stubs." into pi-dev
Krzysztof Kosiński [Tue, 10 Apr 2018 22:31:29 +0000 (15:31 -0700)]
Merge "hwui/debug: Remove glMultiDrawElementsBaseVertexOES stubs." into pi-dev
am: 052dd1e712

Change-Id: I6d0b4eb35dca58ca645a07c658b8fff1da1681d7

6 years agoMerge "Update getIccAuthentication documentation" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 22:23:33 +0000 (22:23 +0000)]
Merge "Update getIccAuthentication documentation" into pi-dev

6 years agoMerge "hwui/debug: Remove glMultiDrawElementsBaseVertexOES stubs." into pi-dev
Krzysztof Kosiński [Tue, 10 Apr 2018 22:23:09 +0000 (22:23 +0000)]
Merge "hwui/debug: Remove glMultiDrawElementsBaseVertexOES stubs." into pi-dev

6 years agoMerge "Properly remove activity from task on start failure." into pi-dev
Bryce Lee [Tue, 10 Apr 2018 22:11:06 +0000 (15:11 -0700)]
Merge "Properly remove activity from task on start failure." into pi-dev
am: 65317bac02

Change-Id: Id0770cf31559d3ccd80332a4fa1178f92b360eeb

6 years agoMerge "DO NOT MERGE: Temporarily disable unsupported sdk warning for P during finali...
Ian Pedowitz [Tue, 10 Apr 2018 22:05:42 +0000 (15:05 -0700)]
Merge "DO NOT MERGE:  Temporarily disable unsupported sdk warning for P during finalization" into pi-dev
am: 7c3f7dd9a5

Change-Id: Ib21b3fdef4c29e43ff385fa3fce5491b381b8530

6 years agoDrop value if the bucket is totally tainted
Chenjie Yu [Tue, 10 Apr 2018 21:59:31 +0000 (14:59 -0700)]
Drop value if the bucket is totally tainted

Bug: 77870358
Change-Id: Ia96970a3254de08f94b91ad53be2fdb9f4db7eb4
Fix: 77870358
Test: unit test

6 years agoMerge "Properly remove activity from task on start failure." into pi-dev
Bryce Lee [Tue, 10 Apr 2018 21:56:08 +0000 (21:56 +0000)]
Merge "Properly remove activity from task on start failure." into pi-dev

6 years agoMerge "Don't return from loop" into pi-dev
Todd Kennedy [Tue, 10 Apr 2018 21:49:58 +0000 (14:49 -0700)]
Merge "Don't return from loop" into pi-dev
am: 2c14da4001

Change-Id: I5bc172137317bd93385392f49f705932b06aed28

6 years agoMerge "DO NOT MERGE: Temporarily disable unsupported sdk warning for P during finali...
TreeHugger Robot [Tue, 10 Apr 2018 21:49:17 +0000 (21:49 +0000)]
Merge "DO NOT MERGE:  Temporarily disable unsupported sdk warning for P during finalization" into pi-dev

6 years agoMerge "[DO NOT MERGE] Fix focusable a11y overlay obstructing introspection" into...
Eugene Susla [Tue, 10 Apr 2018 21:40:33 +0000 (14:40 -0700)]
Merge "[DO NOT MERGE] Fix focusable a11y overlay obstructing introspection" into pi-dev
am: 8ec69c71a7

Change-Id: I798867253bd589105cf9d803b8676f772b31e08b

6 years agoMerge "Don't return from loop" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 21:34:19 +0000 (21:34 +0000)]
Merge "Don't return from loop" into pi-dev

6 years agoMerge "[DO NOT MERGE] Fix focusable a11y overlay obstructing introspection" into...
TreeHugger Robot [Tue, 10 Apr 2018 21:26:31 +0000 (21:26 +0000)]
Merge "[DO NOT MERGE] Fix focusable a11y overlay obstructing introspection" into pi-dev

6 years agoAdd metrics to track auto-brightness settings visibility
Fan Zhang [Tue, 10 Apr 2018 19:57:56 +0000 (12:57 -0700)]
Add metrics to track auto-brightness settings visibility

Bug: 69795935
Test: build
Change-Id: I9caf913b04735470d1aea9fe6b30a91aaf55cf29
Merged-In: I9caf913b04735470d1aea9fe6b30a91aaf55cf29

6 years agoMerge "Alignment of pulsing notifications" into pi-dev
Lucas Dupin [Tue, 10 Apr 2018 21:20:10 +0000 (14:20 -0700)]
Merge "Alignment of pulsing notifications" into pi-dev
am: cca41d6545

Change-Id: I181ead2b3c66d93aba5af3c2f0211b6f49f34136

6 years agoMerge "Alignment of pulsing notifications" into pi-dev
Lucas Dupin [Tue, 10 Apr 2018 21:05:18 +0000 (21:05 +0000)]
Merge "Alignment of pulsing notifications" into pi-dev

6 years agoEnsure colors for active permission icons
Julia Reynolds [Tue, 10 Apr 2018 20:38:08 +0000 (16:38 -0400)]
Ensure colors for active permission icons

Test: manual
Change-Id: I74c91109efaacad4f7743681877b874f77bda630
Fixes: 74512508

6 years agoMerge "Bouncer animation and message" into pi-dev
Lucas Dupin [Tue, 10 Apr 2018 21:00:38 +0000 (14:00 -0700)]
Merge "Bouncer animation and message" into pi-dev
am: be72f3d5b8

Change-Id: Ib2244c7f448e7dafe0f6f87958e8677949de808f

6 years agoMerge "Fix {Spanned|Spannable}StringNoCopyTest test cases" into pi-dev
Seigo Nonaka [Tue, 10 Apr 2018 20:51:12 +0000 (13:51 -0700)]
Merge "Fix {Spanned|Spannable}StringNoCopyTest test cases" into pi-dev
am: 55ae317213

Change-Id: I9e49ba0af1772980a5a8fadd5f6b9d27efad5c8d

6 years agoMerge "Bouncer animation and message" into pi-dev
Lucas Dupin [Tue, 10 Apr 2018 20:45:13 +0000 (20:45 +0000)]
Merge "Bouncer animation and message" into pi-dev

6 years agoMerge "[DO NOT MERGE] Avoid sending content changed a11y events from wrong views...
Eugene Susla [Tue, 10 Apr 2018 20:42:17 +0000 (13:42 -0700)]
Merge "[DO NOT MERGE] Avoid sending content changed a11y events from wrong views" into pi-dev
am: fd34bcc397

Change-Id: Ia1925c5ce2b39fd3e387165d402702e574508c72

6 years agoMerge changes I3a35ed86,I74a9c767 into pi-dev
Julia Reynolds [Tue, 10 Apr 2018 20:37:28 +0000 (13:37 -0700)]
Merge changes I3a35ed86,I74a9c767 into pi-dev
am: 02db955ed8

Change-Id: I206953b1112aec235f08107488159dcdbc3453e9

6 years agoMerge "Fix {Spanned|Spannable}StringNoCopyTest test cases" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 20:32:20 +0000 (20:32 +0000)]
Merge "Fix {Spanned|Spannable}StringNoCopyTest test cases" into pi-dev

6 years agoDO NOT MERGE: Temporarily disable unsupported sdk warning for P during finalization
Ian Pedowitz [Tue, 10 Apr 2018 20:31:50 +0000 (13:31 -0700)]
DO NOT MERGE:  Temporarily disable unsupported sdk warning for P during finalization

This effectively cherrypicks 2830dd7 from master to pi-dev.  Will be reverted

Bug: 77862563
Test: see app warnings without the patch. no app warnings visible when
patch is applied. for example: flash device, launch apps from appbar:
messages, play, chrome, camera.

Change-Id: I6f4a54a8370c87a7b2e89bb8fb6d4ff5b51d95b4

6 years agoMerge "setPackagesSuspended now overwrites all the state" into pi-dev
Suprabh Shukla [Tue, 10 Apr 2018 20:31:42 +0000 (13:31 -0700)]
Merge "setPackagesSuspended now overwrites all the state" into pi-dev
am: e901d69ea6

Change-Id: I0c323bdb3fdbf36a732b383040db5f016db9b212

6 years agoMerge "[DO NOT MERGE] Avoid sending content changed a11y events from wrong views...
Eugene Susla [Tue, 10 Apr 2018 20:18:09 +0000 (20:18 +0000)]
Merge "[DO NOT MERGE] Avoid sending content changed a11y events from wrong views" into pi-dev

6 years agoMerge changes I3a35ed86,I74a9c767 into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 20:17:28 +0000 (20:17 +0000)]
Merge changes I3a35ed86,I74a9c767 into pi-dev

* changes:
  Update incorrect documentation
  Ringer toggle should obey theme color

6 years agoMerge "setPackagesSuspended now overwrites all the state" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 20:15:24 +0000 (20:15 +0000)]
Merge "setPackagesSuspended now overwrites all the state" into pi-dev

6 years agoMerge "Clear out tuner prefs since it is disabled" into pi-dev
Jason Monk [Tue, 10 Apr 2018 20:11:50 +0000 (13:11 -0700)]
Merge "Clear out tuner prefs since it is disabled" into pi-dev
am: 5f205b17ae

Change-Id: Ide1d32462c549386f9867f7992bd3f1e81961e4b

6 years agoMerge "Slice permissions++" into pi-dev
Jason Monk [Tue, 10 Apr 2018 19:56:58 +0000 (12:56 -0700)]
Merge "Slice permissions++" into pi-dev
am: 964631d1a7

Change-Id: Ifdb8d967c0f80838e378748e6f80ff6272663293

6 years agoMerge "Clear out tuner prefs since it is disabled" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 19:56:23 +0000 (19:56 +0000)]
Merge "Clear out tuner prefs since it is disabled" into pi-dev

6 years agoMerge "Slice permissions++" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 19:41:41 +0000 (19:41 +0000)]
Merge "Slice permissions++" into pi-dev

6 years agoMerge "Merge "Add a droiddoc generator for hwbinder.stubs" am: 1142ffcc9b am: c97d768...
Android Build Merger (Role) [Tue, 10 Apr 2018 19:27:46 +0000 (19:27 +0000)]
Merge "Merge "Add a droiddoc generator for hwbinder.stubs" am: 1142ffcc9b am: c97d768b6b" into pi-dev-plus-aosp

6 years agoMerge "Add a droiddoc generator for hwbinder.stubs" am: 1142ffcc9b
Colin Cross [Tue, 10 Apr 2018 19:26:56 +0000 (12:26 -0700)]
Merge "Add a droiddoc generator for hwbinder.stubs" am: 1142ffcc9b
am: c97d768b6b

Change-Id: I63439c9bcf33f7ed64791e84a493e257b7ec7991

6 years agoMerge "Update JNI interface of GetBounds in PrecomputedText" into pi-dev
Seigo Nonaka [Tue, 10 Apr 2018 19:24:33 +0000 (12:24 -0700)]
Merge "Update JNI interface of GetBounds in PrecomputedText" into pi-dev
am: 42c686861c

Change-Id: I734f1715092ec932f8fc5569c4ecadfc45d9ad66

6 years agoList<SliceSpec> -> Set<SliceSpec>
Jason Monk [Thu, 8 Mar 2018 16:31:26 +0000 (11:31 -0500)]
List<SliceSpec> -> Set<SliceSpec>

Test: update-api
Bug: 73123786
Change-Id: Ia618a35fbe81d2aeb5f58d58add0a14069f21bed

6 years agoMerge "[Notif] Show block message for notif with multiple channels" into pi-dev
Rohan Shah [Tue, 10 Apr 2018 19:19:06 +0000 (12:19 -0700)]
Merge "[Notif] Show block message for notif with multiple channels" into pi-dev
am: a4dab5d1ea

Change-Id: Ia63bb40d82092673247304586abbbfc340d446c6

6 years agoMerge "Update JNI interface of GetBounds in PrecomputedText" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 19:06:51 +0000 (19:06 +0000)]
Merge "Update JNI interface of GetBounds in PrecomputedText" into pi-dev

6 years agoMerge "[Notif] Show block message for notif with multiple channels" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 19:06:42 +0000 (19:06 +0000)]
Merge "[Notif] Show block message for notif with multiple channels" into pi-dev

6 years agoMerge "Hiding clear all when replying now" into pi-dev
Selim Cinek [Tue, 10 Apr 2018 19:02:31 +0000 (12:02 -0700)]
Merge "Hiding clear all when replying now" into pi-dev
am: 7cf18d5ec4

Change-Id: Id933193e7e5ef4a834e1d67750fbccb5a68e2d6e

6 years agoUpdate incorrect documentation
Julia Reynolds [Tue, 10 Apr 2018 18:59:19 +0000 (14:59 -0400)]
Update incorrect documentation

Test: make
Change-Id: I3a35ed86600b3b12ced4aecc35a0415e8e05a502
Fixes: 77862126

6 years agoAlignment of pulsing notifications
Lucas Dupin [Tue, 10 Apr 2018 18:49:18 +0000 (11:49 -0700)]
Alignment of pulsing notifications

Test: visual
Change-Id: I1f42cfa26c80ed3f84682d807336477d19b64ec4
Fixes: 77278905

6 years ago[automerger skipped] RESTRICT AUTOMERGE: Prevent reporting fake package name - framew...
akirilov [Tue, 10 Apr 2018 18:44:06 +0000 (11:44 -0700)]
[automerger skipped] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev) am: e5776af814 am: 531975da75  -s ours am: a06c7b7a5c  -s ours
am: 277e803a7b  -s ours

Change-Id: I69110a1b033b779f05ef42cc4d409980bd5e2a25

6 years agoClear out tuner prefs since it is disabled
Jason Monk [Tue, 10 Apr 2018 18:39:47 +0000 (14:39 -0400)]
Clear out tuner prefs since it is disabled

Test: manual
Change-Id: Iff383557761fee92e37de4c4f3fcc10cff333299
Fixes: 74851117

6 years agoMerge "Hiding clear all when replying now" into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 18:33:29 +0000 (18:33 +0000)]
Merge "Hiding clear all when replying now" into pi-dev

6 years ago[automerger skipped] RESTRICT AUTOMERGE: Prevent reporting fake package name - framew...
akirilov [Tue, 10 Apr 2018 18:30:03 +0000 (11:30 -0700)]
[automerger skipped] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev) am: e5776af814 am: 531975da75  -s ours
am: a06c7b7a5c  -s ours

Change-Id: I98aaeeb13d38d4ab4ac0bddb096f6e9ba3e89181

6 years agoMerge "Cache display height in QSContainerImpl." into pi-dev
Amin Shaikh [Tue, 10 Apr 2018 18:25:06 +0000 (11:25 -0700)]
Merge "Cache display height in QSContainerImpl." into pi-dev
am: 26f00b9d87

Change-Id: Ic48b82aca4c26d8471a80c9e495b4e404b8dba15

6 years agoMerge "Add a droiddoc generator for hwbinder.stubs"
Colin Cross [Tue, 10 Apr 2018 18:24:45 +0000 (11:24 -0700)]
Merge "Add a droiddoc generator for hwbinder.stubs"
am: 1142ffcc9b

Change-Id: Ic4b67c00479fe21f6aa2dd41109d9da5514870ca

6 years ago[automerger skipped] RESTRICT AUTOMERGE: Prevent reporting fake package name - framew...
akirilov [Tue, 10 Apr 2018 18:23:14 +0000 (11:23 -0700)]
[automerger skipped] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev) am: e5776af814
am: 531975da75  -s ours

Change-Id: I3df7a9b0722b57c3059ec86ede4e93652404df61

6 years agoLogd retry throttling.
Yangster-mac [Tue, 10 Apr 2018 05:39:53 +0000 (22:39 -0700)]
Logd retry throttling.

Test: statsd test

BUG: b/77852322
Change-Id: I3b4c46aaa592e21bfed13330c2ca72fac8e8320a

6 years agoMerge "WindowLayout: Layout IN_SCREEN floating windows in screen" into pi-dev
Adrian Roos [Tue, 10 Apr 2018 18:20:07 +0000 (11:20 -0700)]
Merge "WindowLayout: Layout IN_SCREEN floating windows in screen" into pi-dev
am: 0767375727

Change-Id: I3ef9b38e239571877f2721d53983d81dcd85c6c3

6 years agoMerge "AnimationControllers: Only unlinkToDeath if previously linked" into pi-dev
Adrian Roos [Tue, 10 Apr 2018 18:14:18 +0000 (11:14 -0700)]
Merge "AnimationControllers: Only unlinkToDeath if previously linked" into pi-dev
am: 6f53a85569

Change-Id: I39caa0a8cbd6ddc3f91f50abd99ddfe2480ac595

6 years agoRESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to...
akirilov [Tue, 10 Apr 2018 18:11:53 +0000 (11:11 -0700)]
RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev)
am: e5776af814

Change-Id: If7a7b5f316cbf8640e0760e590b279494e5341ac

6 years agoMerge changes from topic "am-b1f153a0df5841ff92c0ae3aff339fce" into pi-dev-plus-aosp
Android Build Merger (Role) [Tue, 10 Apr 2018 18:04:29 +0000 (18:04 +0000)]
Merge changes from topic "am-b1f153a0df5841ff92c0ae3aff339fce" into pi-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "hidl-system-api" am: 88a2b68252 am: 09d3aef926  -s ours
  [automerger skipped] Update HIDL-related documentation. am: 9efa13f38c am: 22795d2008  -s ours
  [automerger skipped] Add remaining missing HIDL SystemApi methods. am: ff0a3642e4 am: 35d09a0d29  -s ours
  [automerger skipped] HIDL: reportSyspropMethod -> enableInstrumentation am: 9312938842 am: 12071e63e8  -s ours
  [automerger skipped] Allow HIDL to be used in priv-apps. am: 4dde8a113b am: d6b11ec69f  -s ours

6 years ago[automerger skipped] Merge changes from topic "hidl-system-api" am: 88a2b68252
Colin Cross [Tue, 10 Apr 2018 18:03:09 +0000 (11:03 -0700)]
[automerger skipped] Merge changes from topic "hidl-system-api" am: 88a2b68252
am: 09d3aef926  -s ours

Change-Id: I0be4f97cf2df20d422f5fa8a4498f6f645d05e46

6 years ago[automerger skipped] Update HIDL-related documentation. am: 9efa13f38c
Steven Moreland [Tue, 10 Apr 2018 17:59:50 +0000 (10:59 -0700)]
[automerger skipped] Update HIDL-related documentation. am: 9efa13f38c
am: 22795d2008  -s ours

Change-Id: I92a3b59e354a17e8609ee8489e55e293f91979a0

6 years ago[automerger skipped] Add remaining missing HIDL SystemApi methods. am: ff0a3642e4
Steven Moreland [Tue, 10 Apr 2018 17:56:43 +0000 (10:56 -0700)]
[automerger skipped] Add remaining missing HIDL SystemApi methods. am: ff0a3642e4
am: 35d09a0d29  -s ours

Change-Id: I9b92007d84ce064530c43f5f12d095484398f1ea

6 years agoMerge "Update battery saver string" into pi-dev
Lei Yu [Tue, 10 Apr 2018 17:56:18 +0000 (10:56 -0700)]
Merge "Update battery saver string" into pi-dev
am: 7f0690d59c

Change-Id: I965052d86913b7848610fb65b514a2be6157728a

6 years agoRESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to...
akirilov [Tue, 27 Mar 2018 20:08:47 +0000 (13:08 -0700)]
RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev)

Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
      cts-tradefed run cts -m CtsAccessibilityServiceTestCases
      cts-tradefed run cts -m CtsAccessibilityTestCases

Bug: 69981755
Change-Id: I187e3e9839f654cea9e06e5de93e10e4d1de3109
Merged-In: If3752e106aa7fdee4645dc9852289af471ceff18

6 years agoMerge "Cache display height in QSContainerImpl." into pi-dev
TreeHugger Robot [Tue, 10 Apr 2018 17:55:41 +0000 (17:55 +0000)]
Merge "Cache display height in QSContainerImpl." into pi-dev

6 years ago[automerger skipped] HIDL: reportSyspropMethod -> enableInstrumentation am: 9312938842
Steven Moreland [Tue, 10 Apr 2018 17:53:34 +0000 (10:53 -0700)]
[automerger skipped] HIDL: reportSyspropMethod -> enableInstrumentation am: 9312938842
am: 12071e63e8  -s ours

Change-Id: I858520453d47dfbb549cd9a45cf6ed641712bd5f

6 years agoMerge "WindowLayout: Layout IN_SCREEN floating windows in screen" into pi-dev
Adrian Roos [Tue, 10 Apr 2018 17:53:32 +0000 (17:53 +0000)]
Merge "WindowLayout: Layout IN_SCREEN floating windows in screen" into pi-dev

6 years agoMerge "AnimationControllers: Only unlinkToDeath if previously linked" into pi-dev
Adrian Roos [Tue, 10 Apr 2018 17:52:00 +0000 (17:52 +0000)]
Merge "AnimationControllers: Only unlinkToDeath if previously linked" into pi-dev

6 years ago[automerger skipped] Allow HIDL to be used in priv-apps. am: 4dde8a113b
Steven Moreland [Tue, 10 Apr 2018 17:51:19 +0000 (10:51 -0700)]
[automerger skipped] Allow HIDL to be used in priv-apps. am: 4dde8a113b
am: d6b11ec69f  -s ours

Change-Id: Ibc744558f0f7f9f2d1607e1fc5ad55d562ae6bca

6 years agoMerge changes from topic "hidl-system-api"
Colin Cross [Tue, 10 Apr 2018 17:43:52 +0000 (10:43 -0700)]
Merge changes from topic "hidl-system-api"
am: 88a2b68252

Change-Id: I862274d2d6a258f252370a9ae3843a31c038d684

6 years agoUpdate HIDL-related documentation.
Steven Moreland [Tue, 10 Apr 2018 17:39:10 +0000 (10:39 -0700)]
Update HIDL-related documentation.
am: 9efa13f38c

Change-Id: I8a053ee95610272f97f0031936ac3d3fe50766d2

6 years agoMerge "Update battery saver string" into pi-dev
Lei Yu [Tue, 10 Apr 2018 17:38:30 +0000 (17:38 +0000)]
Merge "Update battery saver string" into pi-dev

6 years agoAdd remaining missing HIDL SystemApi methods.
Steven Moreland [Tue, 10 Apr 2018 17:34:34 +0000 (10:34 -0700)]
Add remaining missing HIDL SystemApi methods.
am: ff0a3642e4

Change-Id: Iafa60151da6c8b994911ff077cfcfdf53bc61b81