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

445445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Johnston
a219bddf96 Merge "Clear the password reset token when the device owner is removed." 2019-09-26 14:21:32 +00:00
TreeHugger Robot
7ff0acc029 Merge "Ensure component helper is set before resolving activities." 2019-09-26 14:18:12 +00:00
Nataniel Borges
09aea812c0 Merge "Add secure settings to the test apps" am: 1170b46a74 am: a9c2747b31 am: f84fab04ea 
am: 1084740563

Change-Id: I98cdd34dc4bae479ba51eaf5d6f34bbef8dec622
 2019-09-26 05:38:50 -07:00
Nataniel Borges
1084740563 Merge "Add secure settings to the test apps" am: 1170b46a74 am: a9c2747b31 
am: f84fab04ea

Change-Id: I2cd3e75750a5c5459867852c7be632c3c01fd3f8
 2019-09-26 05:32:41 -07:00
Nataniel Borges
f84fab04ea Merge "Add secure settings to the test apps" am: 1170b46a74 
am: a9c2747b31

Change-Id: I7dac81f71b873d77e4f11acbf727b149f9217fd5
 2019-09-26 05:25:45 -07:00
Nataniel Borges
a9c2747b31 Merge "Add secure settings to the test apps" 
am: 1170b46a74

Change-Id: Id8357382f02ea469b2923eec79fc897417db21c0
 2019-09-26 05:13:41 -07:00
Roshan Pius
082c5003c2 Merge changes from topics "scanner_multiple_sta", "sta_sta_same_bands" 
* changes:
  WifiScanner: Add missing @hide constants
  WifiScanner: Add support to add more results to ScanData
 2019-09-26 12:03:19 +00:00
Treehugger Robot
1170b46a74 Merge "Add secure settings to the test apps" 2019-09-26 11:57:33 +00:00
Pavel Grafov
64247a1661 Merge "Throw if admin sets password constraints that have no effect." 2019-09-26 10:55:54 +00:00
Adam Pardyl
b1c0a256f2 Merge "Fix broken ProtoLogIntegrationTest" 2019-09-26 10:08:02 +00:00
Nataniel Borges
97572097a4 Add secure settings to the test apps 
When running the flicker tests on postsubmit the apps require the following permission: "android.permission.WRITE_SECURE_SETTINGS"

Test: atest FlickerTests
Change-Id: I6a2647fb6d2351617297b3f89ae3f3edc1aad981
 2019-09-26 12:01:57 +02:00
TreeHugger Robot
4ec9aa4b4e Merge "Import ProtoStore" 2019-09-26 09:58:23 +00:00
Adam Pardyl
751356358d Fix broken ProtoLogIntegrationTest 
Fixed a test breakage introduced in ag/9447040.

Bug:
Test: atest WmTests
Change-Id: If751f9919cf87320cfe8ac47cff2aa9f46060ae2
 2019-09-26 11:50:26 +02:00
Abhijeet Kaur
2f0ff57798 Merge "Handle legacy broadcasts from dumpstate logic in onFinished() callback" 2019-09-26 09:48:42 +00:00
Alex Johnston
6322093fc3 Clear the password reset token when the device owner is removed. 
Bug: 130026113
Test: Atest DevicePolicyManagerTest
      Atest MixedManagedProfileOwnerTest
      manual testing

Change-Id: I635fbb3fdf55a8c64b561752d74855fb83678109
 2019-09-26 10:10:51 +01:00
Jin Seok Park
12812746ce Merge "Add support for parsing Exif chunk in PNG" 2019-09-26 08:17:54 +00:00
Howard Chen
45e76149f0 [automerger skipped] Merge "DynamicSystemService: Use IGsid which reference-counts the gsid service." am: 5d8d5f9af7 am: 0f2909389e am: 9b4c37be2c 
am: d7a922e46a -s ours
am skip reason: change_id I6075d08ed16b86fe158a6045ad23d0867ae9b66c with SHA1 38f030dc76 is in history

Change-Id: I9fdd3a5bf5740fd06fd11ae8eb28603d566d9403
 2019-09-26 00:45:05 -07:00
Howard Chen
d7a922e46a Merge "DynamicSystemService: Use IGsid which reference-counts the gsid service." am: 5d8d5f9af7 am: 0f2909389e 
am: 9b4c37be2c

Change-Id: Ib5e5556d8c7f12439f139ca25a73aa7e81162c6a
 2019-09-26 00:37:48 -07:00
Howard Chen
9b4c37be2c Merge "DynamicSystemService: Use IGsid which reference-counts the gsid service." am: 5d8d5f9af7 
am: 0f2909389e

Change-Id: I3fe64df1265e1771f380ed9397797a7d69223621
 2019-09-26 00:25:15 -07:00
Howard Chen
0f2909389e Merge "DynamicSystemService: Use IGsid which reference-counts the gsid service." 
am: 5d8d5f9af7

Change-Id: I73b9a5fcdd4e5738214cb19f068a3630dfc24b38
 2019-09-26 00:11:50 -07:00
TreeHugger Robot
0cea1d0332 Merge "Move Indexable to SettingsLib" 2019-09-26 06:51:16 +00:00
Howard Chen
5d8d5f9af7 Merge "DynamicSystemService: Use IGsid which reference-counts the gsid service." 2019-09-26 06:48:07 +00:00
Chen Xu
bb6bc654b2 [automerger skipped] Merge "use @SystemAPI for creating UserHandle" am: 420bf71217 am: e207bff221 am: e62f727fdb 
am: 1fbe02f117 -s ours
am skip reason: change_id Id2a696bed6a80c92291c8f968f3aaa8db6bb83df with SHA1 59d76e97bb is in history

Change-Id: I4f85a86c3120ab175b32e4317c71c69aa6c4eb46
 2019-09-25 22:30:57 -07:00
Chen Xu
ef5cdc1437 [automerger skipped] Merge "use @SystemAPI in AppOpsManager" am: 83fe845c8c am: 7ca0425127 am: a5d9fba763 
am: b92ef48424 -s ours
am skip reason: change_id Ief8d20b62df5fcd99980182d9bb896bd82ac70e9 with SHA1 324606e459 is in history

Change-Id: Iab81f50741c2d4a5e631a018884d06e087c7c8e4
 2019-09-25 22:30:45 -07:00
Chen Xu
1042cb3ea5 [automerger skipped] Merge "use packageManager @SystemAPI" am: e958bbd8ae am: 206d891d07 am: f9c3973b11 
am: 4427f74485 -s ours
am skip reason: change_id I1c0cb7840cb7d68fd720723eec96aa51aefc1df8 with SHA1 4b5f423c5c is in history

Change-Id: I092971554f5b038a2ef002f9b7b72654517a53ed
 2019-09-25 22:30:34 -07:00
Bill Yi
689e9e1dcd [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4160fa8a6d -s ours am: 9e4189fef5 -s ours 
am: fd8f5dc841 -s ours
am skip reason: subject contains skip directive

Change-Id: I9aa4b1bff3c045fc2a6a9a6a1f38568c0f5045d4
 2019-09-25 22:19:58 -07:00
Bill Yi
3ff16a43b5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 48de73d2bf -s ours am: 36fe996360 -s ours 
am: d814d68a19 -s ours
am skip reason: subject contains skip directive

Change-Id: I02c962bfd1db24b6908c9ec8bafabd3b008ace1b
 2019-09-25 22:16:42 -07:00
Chen Xu
1fbe02f117 Merge "use @SystemAPI for creating UserHandle" am: 420bf71217 am: e207bff221 
am: e62f727fdb

Change-Id: I6f297afa39e33df333284b9d27abcbb155a1d06d
 2019-09-25 22:14:57 -07:00
Chen Xu
b92ef48424 Merge "use @SystemAPI in AppOpsManager" am: 83fe845c8c am: 7ca0425127 
am: a5d9fba763

Change-Id: I2c69a471dca995e474893d2ec068cc001c2c8b5f
 2019-09-25 22:14:47 -07:00
Chen Xu
4427f74485 Merge "use packageManager @SystemAPI" am: e958bbd8ae am: 206d891d07 
am: f9c3973b11

Change-Id: I824d83b6c6cada0c29a302b93644a08766c4a2a7
 2019-09-25 22:14:34 -07:00
Bill Yi
8dfb55345f [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a737ae8f0d -s ours am: 850e3c7f69 -s ours 
am: 7f92027e2f -s ours
am skip reason: subject contains skip directive

Change-Id: I9e2fdedb2796d6efdceb5a2fa8ab3dfab2d2a97f
 2019-09-25 22:13:54 -07:00
Bill Yi
de64ff25da [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0bc8e73ec9 -s ours am: b1547258b7 -s ours 
am: af21a476ea -s ours
am skip reason: subject contains skip directive

Change-Id: I6cb7f0e8b0186eff5b18fa134493f1673b8e8a3b
 2019-09-25 22:10:32 -07:00
Bill Yi
df12f3c048 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 251a4aa05b -s ours am: 86ff1a8c0f -s ours 
am: a8a40a5109 -s ours
am skip reason: subject contains skip directive

Change-Id: I115b7374b589485507113da9b4637fcdbdd97a5e
 2019-09-25 22:05:58 -07:00
Bill Yi
fd8f5dc841 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4160fa8a6d -s ours 
am: 9e4189fef5 -s ours
am skip reason: subject contains skip directive

Change-Id: I41e5a560295149dcea0500a50b07582f9cd1dae8
 2019-09-25 22:00:51 -07:00
Chen Xu
e62f727fdb Merge "use @SystemAPI for creating UserHandle" am: 420bf71217 
am: e207bff221

Change-Id: I3658d64caae42a3fc229956b34e7e077e2630c90
 2019-09-25 21:57:21 -07:00
Chen Xu
a5d9fba763 Merge "use @SystemAPI in AppOpsManager" am: 83fe845c8c 
am: 7ca0425127

Change-Id: I5deb21c0fdd034f3060a08b4d9f8ca44fdc21ddc
 2019-09-25 21:57:12 -07:00
Bill Yi
d814d68a19 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 48de73d2bf -s ours 
am: 36fe996360 -s ours
am skip reason: subject contains skip directive

Change-Id: I8f48142dc45512cd11a76ca997d512e6c62d08b5
 2019-09-25 21:57:10 -07:00
Chen Xu
f9c3973b11 Merge "use packageManager @SystemAPI" am: e958bbd8ae 
am: 206d891d07

Change-Id: Iec4e41628f3378876605c119ac7f7f58634d176c
 2019-09-25 21:57:02 -07:00
Bill Yi
d58d6cb903 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 8182a8e092 -s ours am: a33dc507ea -s ours 
am: 2d17b86963 -s ours
am skip reason: subject contains skip directive

Change-Id: I529112f6e5a901e88516d02461f2fbc0f9469e73
 2019-09-25 21:54:34 -07:00
Bill Yi
7f92027e2f [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a737ae8f0d -s ours 
am: 850e3c7f69 -s ours
am skip reason: subject contains skip directive

Change-Id: Icb701eb3f7e6b62e832eebf534d83108281363ba
 2019-09-25 21:53:59 -07:00
Bill Yi
af21a476ea [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0bc8e73ec9 -s ours 
am: b1547258b7 -s ours
am skip reason: subject contains skip directive

Change-Id: I3f14fb3d9653d3686c34305217342d67eb3cd273
 2019-09-25 21:50:14 -07:00
lumark
959da09760 Merge "Fix Password entry won't enable when lockout finished in screen-off" into qt-qpr1-dev am: 407f2f37c8 
am: edd0e2784d

Change-Id: I5d7b6cb01c1e3a92ab4297ddecce04869d2e9996
 2019-09-25 21:49:05 -07:00
Bill Yi
9e4189fef5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 4160fa8a6d -s ours
am skip reason: subject contains skip directive

Change-Id: I78d272630ed810208095b3c13e47dd4d7a8c1a12
 2019-09-25 21:44:17 -07:00
Bill Yi
a8a40a5109 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 251a4aa05b -s ours 
am: 86ff1a8c0f -s ours
am skip reason: subject contains skip directive

Change-Id: Ib1eebddfdd0727614dc7a5eae0831585bdc10ba8
 2019-09-25 21:42:21 -07:00
Bill Yi
36fe996360 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 48de73d2bf -s ours
am skip reason: subject contains skip directive

Change-Id: I67f43c0be73d65e62c509b6b2f1fd3d3257b80fe
 2019-09-25 21:40:52 -07:00
Bill Yi
2d17b86963 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 8182a8e092 -s ours 
am: a33dc507ea -s ours
am skip reason: subject contains skip directive

Change-Id: Id7c837a6241f71887a7f67dc1dcdb5b4d2c4d10c
 2019-09-25 21:37:46 -07:00
Bill Yi
850e3c7f69 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: a737ae8f0d -s ours
am skip reason: subject contains skip directive

Change-Id: I6d6b647cd0e03a3fb530698b6ad0adc4ce2204c5
 2019-09-25 21:37:13 -07:00
Bill Yi
b1547258b7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 0bc8e73ec9 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic15b017eb1cdadc0279c6ac187486b0eabe811a7
 2019-09-25 21:33:43 -07:00
lumark
edd0e2784d Merge "Fix Password entry won't enable when lockout finished in screen-off" into qt-qpr1-dev 
am: 407f2f37c8

Change-Id: If16c47f20066500e1ded6f96f64877c38bfdc5f7
 2019-09-25 21:30:18 -07:00
Bill Yi
86ff1a8c0f [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 251a4aa05b -s ours
am skip reason: subject contains skip directive

Change-Id: I773bb8bc2ab1167200a41f6645b5ba4650fd4514
 2019-09-25 21:29:28 -07:00