Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
318,798 Commits 3 Branches 0 Tags
f04714c59a5ad92e79bb037372f90213e46a92e8
Commit Graph

77483 Commits

Author SHA1 Message Date
TreeHugger Robot
f04714c59a Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev 2018-06-04 11:44:21 +00:00
Jakub Pawlowski
459888be84 Fix bad type for txPower in PeriodicAdvertisingReport serialization 
Bug: 69634768
Test: compilation
Change-Id: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Merged-In: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
 2018-05-29 22:36:32 +00:00
Adrian Roos
3cd5e3d9bb WM: Prevent secondary display focus while keyguard is up 
Fixes an issue where input intended for the keyguard could end up going
to a different display.

To prevent this, make sure that only the default display can get focused
when the keyguard is showing.

Change-Id: I6463c44aedca06930d2c9bda7c45ffd93141308c
Merged-In: I6463c44aedca06930d2c9bda7c45ffd93141308c
Fixes: 71786287
Test: atest DisplayContentTests
 2018-05-24 14:05:44 +02:00
Android Build Merger (Role)
3543522564 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 am: 232f42c7b8 am: 76a04ff670 am: 2bd91daa06 
Change-Id: I88ccfc06e5639ce48c5e8a4659d2cbb7c47b5825
 2018-05-09 17:20:01 +00:00
Android Build Merger (Role)
2bd91daa06 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 am: 232f42c7b8 am: 76a04ff670 
Change-Id: Id013258bbcfb2664c03df15a082bc04ea053663e
 2018-05-09 17:19:53 +00:00
Android Build Merger (Role)
76a04ff670 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 am: 232f42c7b8 
Change-Id: I42da7843ef9ecdbc1411a25feb95701150664490
 2018-05-09 17:19:45 +00:00
Android Build Merger (Role)
232f42c7b8 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 
Change-Id: I4f4b15c92832c0806fcf3e67f6fd5c9b13eebc1f
 2018-05-09 17:19:38 +00:00
Android Build Merger (Role)
97f7498c18 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 
Change-Id: Ia6ba75b4938ab6d9ec0ffe1bc39b6ce6995a808e
 2018-05-09 17:19:32 +00:00
Android Build Merger (Role)
9e291fe8c2 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 
Change-Id: Ia3658c17dc890ca2de951da5c701e953ce8c969b
 2018-05-09 17:19:18 +00:00
Android Build Merger (Role)
6b95503960 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f 
Change-Id: I7aaceff0646a5e738ed862c34645e548aabf62f1
 2018-05-09 17:19:12 +00:00
Android Build Merger (Role)
a99414f51f [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a 
Change-Id: Ia89ea1adb47be3b70f5db292677c4c19194a04db
 2018-05-09 17:19:07 +00:00
Android Build Merger (Role)
743abb939a [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 
Change-Id: I379d54d926e01da53b637bba6b3b1ee8577cbdbb
 2018-05-09 17:19:02 +00:00
Eugene Susla
6c68a69288 Nullcheck to fix Autofill CTS 
Test: presubmit
Fixes: 70506475
Bug: 69981755
Change-Id: I187bed4889a4901a7137a2995178ea651ed09186
 2018-05-09 17:18:59 +00:00
Hansong Zhang
d0c2aa5b1b DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name 
Test: manual
Bug: 73173182
Change-Id: I3c25af233742e63351a68e8c5a279b51a94e49e2
Merged-In: I7f2201cab36adf7f01d1a794d783cb78a536811f
 2018-04-26 21:26:17 +00:00
Android Build Merger (Role)
4eaa691175 [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81 am: 9822117184 am: 2b41ff76b0 
Change-Id: I6e5bf8c2f05f44bc292f4c0ec1fcc885a4a24655
 2018-04-26 21:19:03 +00:00
Android Build Merger (Role)
2b41ff76b0 [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81 am: 9822117184 
Change-Id: I8e628fee8dd1b9c488aca0ce8f3508c109dd9e18
 2018-04-26 21:18:58 +00:00
Android Build Merger (Role)
9822117184 [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81 
Change-Id: I12322ddbacc848912426bacaa49469d6d5982c60
 2018-04-26 21:18:53 +00:00
Android Build Merger (Role)
b906043c81 [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 
Change-Id: I3f951fac78c6e2da84eac511d3b0e19141e90153
 2018-04-26 21:18:47 +00:00
Hansong Zhang
b6cde9ecc1 DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name 
Test: manual
Bug: 73173182
Change-Id: I3c25af233742e63351a68e8c5a279b51a94e49e2
 2018-04-26 21:18:46 +00:00
Android Build Merger (Role)
365fb1c844 [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f 
Change-Id: I937e2d9a676b38f6a18cda70f42d06eaa22ce051
 2018-04-26 21:18:27 +00:00
Android Build Merger (Role)
0cd0cef08f [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e 
Change-Id: If7693b2ff5785a1a09920061b318aaac33f5d6b6
 2018-04-26 21:18:21 +00:00
Android Build Merger (Role)
8fbe4bce1e [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c 
Change-Id: Iac403f5118d55d9919745d98eba260dd2929d56c
 2018-04-26 21:18:14 +00:00
Hansong Zhang
984dfe074c DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name 
Test: manual
Bug: 73173182
Change-Id: I3c25af233742e63351a68e8c5a279b51a94e49e2
 2018-04-26 14:17:52 -07:00
akirilov
e5776af814 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
 2018-04-10 17:55:55 +00:00
Android Build Merger (Role)
bae1ea6478 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116 am: 1890afd456 
Change-Id: I1d6b280c14a7a6166221ea0d1448de7bc7feb18c
 2018-04-09 22:24:28 +00:00
Android Build Merger (Role)
1890afd456 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116 
Change-Id: Ib3a14de258a548393279940fd3aeb067f2596ca8
 2018-04-09 22:24:22 +00:00
Android Build Merger (Role)
5ddeef7116 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 
Change-Id: If515d9ec229e37bdc1368a96ae1f1b474dd50ebe
 2018-04-09 22:24:16 +00:00
Android Build Merger (Role)
93d9547b61 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c 
Change-Id: I793b787b6275262f1df6caa9262054e15c94840f
 2018-04-09 22:24:08 +00:00
akirilov
33c37cb37c RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) 
Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
      cts-tradefed run cts -m CtsAccessibilityServiceTestCases
      cts-tradefed run cts -m CtsAccessibilityTestCases

Bug: 69981755
Change-Id: I187e3e9839f654cea9e06e5de93e10e4d1de3109
 2018-04-09 22:24:05 +00:00
Android Build Merger (Role)
0df0b30be9 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 
Change-Id: I9f6c6fedfdc987a2acf1978a71fb0bdcd034e9e0
 2018-04-09 21:00:20 +00:00
Android Build Merger (Role)
86f5488521 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 
Change-Id: Ib50692050fd4e62ad80f24531818a378c75dfe25
 2018-04-09 21:00:15 +00:00
Android Build Merger (Role)
d672eef559 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a 
Change-Id: I000fae45e723679ba44b378a36a85daef20ae96d
 2018-04-09 21:00:08 +00:00
akirilov
de71ee469a RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) 
Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
      cts-tradefed run cts --package android.accessibilityservice
      cts-tradefed run cts --package android.accessibility

BUG:69981755

Change-Id: Id9990ccf1e88cea441f9b8927e849e67a059cfe4
 2018-04-09 21:00:05 +00:00
Fyodor Kupolov
4921986db7 Use concrete CREATOR instance for parceling lists 
Replaced readTypedArrayList/writeTypedArrayList with
writeTypedList/createTypedArrayList(CREATOR)

Bug: 71508348
Test: CtsAutoFillServiceTestCases pass
Merged-In: I2a8321023b40cc74b7026eb0fb32a9cc5f5543a9
Change-Id: Id17d02e40a4ae567bf2d74d2ea8ba4d8a943bdb7
 2018-03-16 23:37:13 +00:00
Android Build Merger (Role)
9d13b0f6ca [automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 
Change-Id: I9f69b090824a6c91bf11dbc0929ba5988a06af52
 2018-03-15 19:59:37 +00:00
Android Build Merger (Role)
019eec3923 [automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 
Change-Id: I8539a02510ed9a61b683c66c66de7d1b319c2603
 2018-03-15 19:59:32 +00:00
Android Build Merger (Role)
b8dad6c644 [automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 
Change-Id: I5cb1316547ced23a1259e068d1ea34631d105608
 2018-03-15 19:59:26 +00:00
Marco Nelissen
b514ce9b38 DO NOT MERGE Rework thumbnail cleanup 
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
 2018-03-15 19:58:42 +00:00
Android Build Merger (Role)
93f8bfa5c4 [automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 
Change-Id: Ib890ce7495c1d5e64968cc9177ce3785bcfdedde
 2018-03-14 15:23:39 +00:00
Android Build Merger (Role)
d0fcb49352 [automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 
Change-Id: I49de968aa0daa18b60921af1a381f77d13a8ff0e
 2018-03-14 15:23:32 +00:00
Android Build Merger (Role)
1b6f3f9a97 [automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab 
Change-Id: I87dcb4ce2fc52e0ed6ce5f79d15ab49084d088e3
 2018-03-14 15:23:19 +00:00
Alan Viverette
f3c2e0b3ab DO NOT MERGE Fix build with SDK 24-like implementation of constructor 
Bug: 71992105
Test: manual
Change-Id: I106760ada9c85adde29fd143e5dfcd924fd95f54
 2018-03-14 11:22:10 -04:00
Android Build Merger (Role)
75767d1e3c [automerger] Rework thumbnail cleanup am: 0dc23f95a1 
Change-Id: Ia3a740184191990fa43ca705b5eae8ea572fb6c1
 2018-03-13 00:23:52 +00:00
Marco Nelissen
0dc23f95a1 Rework thumbnail cleanup 
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
 2018-03-13 00:23:51 +00:00
Marco Nelissen
0d0ff3390d Merge "Rework thumbnail cleanup" into nyc-mr1-dev 2018-03-12 21:29:58 +00:00
Marco Nelissen
338438b389 Rework thumbnail cleanup -- DO NOT MERGE 
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
 2018-03-10 04:13:09 +00:00
Android Build Merger (Role)
cb9dd5d0e6 [automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a 
Change-Id: Id58fd0db50cf10dd0af21464259e7a6e366edecd
 2018-03-09 20:33:52 +00:00
Android Build Merger (Role)
97eb9d056a [automerger] Rework thumbnail cleanup am: 82a2a87474 
Change-Id: Ifbeecd9b3406da6151067987709776adeb807c1f
 2018-03-09 20:33:45 +00:00
Marco Nelissen
82a2a87474 Rework thumbnail cleanup 
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
 2018-03-09 20:33:30 +00:00
Alan Viverette
f26c5dbcdb Merge changes from topic "viewpager_state" into mnc-dr1.5-dev 
* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version
 2018-03-09 18:43:02 +00:00