drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
352,862 Commits 1 Branch 0 Tags
Commit Graph

352862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jackqdyulei
29f91ea0ac Add settings constants for battery tip 
Bug: 70570352
Test: Build
Change-Id: I6639916b5b685d3ee64cfc2ea0771c1244e0e437
 2017-12-21 16:01:15 -08:00
Brad Ebinger
058a752502 Merge "Add new reason code for call barring" am: a003d996b9 
am: ddf31e1810

Change-Id: Ieb37e63f6843c21a40e366b08d8cf40b2f6d69d8
 2017-12-21 23:59:45 +00:00
Brad Ebinger
ddf31e1810 Merge "Add new reason code for call barring" 
am: a003d996b9

Change-Id: I36fd5803e1a1a535a000dc4e69dc7238fa26efbd
 2017-12-21 23:53:13 +00:00
Robert Berry
5bbc3eeb8b Merge "Add KeySyncTask" 2017-12-21 23:45:36 +00:00
Brad Ebinger
a003d996b9 Merge "Add new reason code for call barring" 2017-12-21 23:45:01 +00:00
Gil O'Neil
42995cfcce Merge "Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis" 2017-12-21 23:36:20 +00:00
Andrii Kulian
1c110302fe Fix object pool for lifecycler 
The original implementation of object pool for lifecycle
transactions tried to always recycle objects after a
transaction was scheduled. In case when a client was running
in the same process this lead to objects being emptied before
it could actually perform the transaction.
Also when checking if object was already in the pool we should
use "==" instead of equality check.

Bug: 70568084
Bug: 70526039
Bug: 70616950
Test: android.app.servertransaction.ObjectPoolTests
Change-Id: I45eeecc189b9a458d8efdfed256b81cf0baf8b95
 2017-12-21 15:36:08 -08:00
Jake Wharton
d77bce88d4 Expose removeAt(int) for parity with other sparse collections. 
Bug: 70934959
Test: none
Change-Id: Ic26a9fba610d6361247e0485803b52569fbf4a38
 2017-12-21 18:25:25 -05:00
TreeHugger Robot
9d51240f03 Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions" 2017-12-21 23:22:34 +00:00
Andrew Solovay
450c132dc8 Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev am: acc55e61dd 
am: 4adbc6b5b0  -s ours

Change-Id: I7dcbba1052771fbfe6ef74c10b52a41941db1895
 2017-12-21 23:02:51 +00:00
Jean-Michel Trivi
82b43303ee Merge "AudioManager: add method to query stream attenuations in dB" 2017-12-21 22:58:53 +00:00
Hall Liu
1bf615cb96 Merge "Add feature flag for RTT in call log" am: 138d07f82d am: 9a5e663d97 
am: 51c68e6570

Change-Id: I44de419a5b170d6fd5b1d26f4291eb3750b11c59
 2017-12-21 22:56:27 +00:00
Andrew Solovay
4adbc6b5b0 Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev 
am: acc55e61dd

Change-Id: I35d0f71a7da2dcae3ed3bab4aa111290ea4c4c60
 2017-12-21 22:55:33 +00:00
Hall Liu
51c68e6570 Merge "Add feature flag for RTT in call log" am: 138d07f82d 
am: 9a5e663d97

Change-Id: Ibdf102659e079844e81faac327b0d9cfb3b0d9de
 2017-12-21 22:47:29 +00:00
Felipe Leme
96a3e51630 Always call start a new fill response when the user manually request autofill. 
Test: atest CtsAutoFillServiceTestCases:LoginActivityTest#testAutofillManuallyAlwaysCallServiceAgain
Test: atest CtsAutoFillServiceTestCases

Fixes: 69318180

Change-Id: I67f63f57f249bb109ca764bd2d0911ad6f5c4065
 2017-12-21 14:45:22 -08:00
Android Build Merger (Role)
8a22767f42 Merge "Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am: 045fdae1b3 am: d6c2722094 am: f3caa4dc5a -s ours" 2017-12-21 22:43:36 +00:00
Hansong Zhang
94343e6799 Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am: 045fdae1b3 am: d6c2722094 
am: f3caa4dc5a  -s ours

Change-Id: I0e57ed1b1d48339ce841eb9bd193ded71e48e053
 2017-12-21 22:41:34 +00:00
TreeHugger Robot
382ac3757d Merge "Modify system properties proto" 2017-12-21 22:41:33 +00:00
TreeHugger Robot
acc55e61dd Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev 2017-12-21 22:41:15 +00:00
Hall Liu
9a5e663d97 Merge "Add feature flag for RTT in call log" 
am: 138d07f82d

Change-Id: Id04b93ecd8cd25f59354fe209cb98c05248afaa8
 2017-12-21 22:40:11 +00:00
TreeHugger Robot
9b62258fb3 Merge "Always synchronize the OemUnlockAllowed bit to the FRP partition" 2017-12-21 22:36:44 +00:00
Hansong Zhang
f3caa4dc5a Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am: 045fdae1b3 
am: d6c2722094

Change-Id: I7ef265d36f4a42e7e9a74e63e8b343b28b63c8b3
 2017-12-21 22:31:53 +00:00
Hall Liu
138d07f82d Merge "Add feature flag for RTT in call log" 2017-12-21 22:31:45 +00:00
Selim Cinek
b7bafbcc7c Fixed a SystemUI crash 
The iconState can be null. We're now logging
if it happen to get some additional information,
but the crash should be avoided.

Test: add notifications
Change-Id: I134743ef56a45e8b72a1603a2622350245885f4b
Fixes: 70694861
 2017-12-21 22:29:21 +00:00
Hansong Zhang
d6c2722094 Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" 
am: 045fdae1b3

Change-Id: I8f7a28ce56435bd4d1f01631b188a62f35c3f100
 2017-12-21 22:08:20 +00:00
TreeHugger Robot
7e3cae8584 Merge "Workaround apps that are doing very very bad things" 2017-12-21 22:07:15 +00:00
Oscar Shu
93d7a07597 Merge "WifiManager API documentation update" 2017-12-21 22:05:44 +00:00
TreeHugger Robot
7a02bfea15 Merge "Import translations. DO NOT MERGE" 2017-12-21 22:00:31 +00:00
Treehugger Robot
045fdae1b3 Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" 2017-12-21 21:56:10 +00:00
yuemingw
5fe75dc26d Add DISALLOW_AIRPLANE_MODE. 
Bug: 67675441
Test: cts test will be added for b/67675455

Design doc: https://docs.google.com/document/d/1rvEg5jE3lMhjH-OA0iTLBUY2opM96fg7BrP81MoPnmg/edit#

Change-Id: I902b281695a7e734639c9d6d4852a0e96fea8305
 2017-12-21 21:49:03 +00:00
yuemingw
7cc2c4c2ee Add DISALLOW_CONFIG_LOCATION_MODE. 
Bug: 67674888
Test: cts test will be added in b/67674901

Design doc: https://docs.google.com/document/d/1rvEg5jE3lMhjH-OA0iTLBUY2opM96fg7BrP81MoPnmg/edit#

Change-Id: I284d421eedfb238084fa61e7661638c22b28734f
 2017-12-21 21:48:15 +00:00
Holly Jiuyu Sun
fd88d43563 Merge "Add asn1 to platform." am: bdd0da8fa7 am: ea1d85d484 
am: a44b3e3d12  -s ours

Change-Id: I7ae27f189174885f2e7c528c87a04aefc925c47a
 2017-12-21 21:38:00 +00:00
Holly Jiuyu Sun
a44b3e3d12 Merge "Add asn1 to platform." am: bdd0da8fa7 
am: ea1d85d484

Change-Id: Ib2968038bcacdc81e2249dc5e3a40f25ceb191b7
 2017-12-21 21:29:24 +00:00
Bill Yi
e8f083549b Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c0745b94c2 -s ours 
am: f49bf087ba  -s ours

Change-Id: Id61b4a2da9551c8c084d7b5e71333105cbdfb225
 2017-12-21 21:22:14 +00:00
Holly Jiuyu Sun
ea1d85d484 Merge "Add asn1 to platform." 
am: bdd0da8fa7

Change-Id: Ic34f9bd45e7fb46bae2afe5be0cc453d87b276bd
 2017-12-21 21:19:28 +00:00
Bill Yi
f49bf087ba Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 
am: c0745b94c2  -s ours

Change-Id: Ia1425c1a21585764700000bf98fb25d3346bd639
 2017-12-21 21:17:15 +00:00
TreeHugger Robot
c0745b94c2 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-12-21 21:08:50 +00:00
Wyatt Riley
d87cf91762 Providing GNSS Model Name & Year 
GNSS Model Year moves from a TestApi to public
GNSS Model Name is connected from a new .hal to public

Bug: 38003769
Test: Builds, works with CTS & Test App on Pixel 2
Change-Id: I3e0a56c60e1a4d298e120df11ffd37b06ecea050
 2017-12-21 13:07:03 -08:00
Holly Jiuyu Sun
bdd0da8fa7 Merge "Add asn1 to platform." 2017-12-21 21:01:40 +00:00
Yi Jin
526aa056bd Modify system properties proto 
Test: atest incident_helper_test
Change-Id: Id81922e7f4412090e3b72b3a0fc1151995635885
 2017-12-21 12:57:08 -08:00
goneil
d75e242fb8 Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions 
Bug: 70177947
Test: None
Merged-In:If26ae0c69d3266c2639b61b3ed32df3f1cb2c36f
Change-Id: Ie08e56c9409c1fbbe24133b0981f5ab35f6a2f24
 2017-12-21 12:55:41 -08:00
goneil
52f3d19c3b Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions 
Bug: 70177947
Test: None
Change-Id: If26ae0c69d3266c2639b61b3ed32df3f1cb2c36f
 2017-12-21 12:53:27 -08:00
Tyler Gunn
875aefc5fc Merge "Add logging and disconnect reason for null connections." am: 7661e81f85 am: c840efcf7e 
am: 5d7c823e16

Change-Id: I57395d052d284ca3b8071b71dc762c1147d1107a
 2017-12-21 20:43:39 +00:00
Bill Yi
5c72a77bca Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours am: 0a1948e515 -s ours am: 7cb6513f6d -s ours am: f0687d1201 -s ours am: 9c166446fd -s ours 
am: a1834cfc3f  -s ours

Change-Id: Ia65be7aaf7fdf86151eb0ace6e2cb3400a0b73c2
 2017-12-21 20:39:18 +00:00
Bill Yi
17c1ed9368 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours am: ea2e302eff -s ours am: b6dab6b3ee -s ours am: 1f9ae3b912 -s ours am: 66acdceb9b -s ours 
am: 97ae42b0d6  -s ours

Change-Id: Iab46453d06f635518df8ada21c74afb82f6e4a65
 2017-12-21 20:37:45 +00:00
Bill Yi
dd8460e32f Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours am: d21211470c -s ours am: f1c75d66ec -s ours am: b7a560fb10 -s ours am: 5af20c1c28 -s ours 
am: 1598332a7f  -s ours

Change-Id: Id3efdeb1929c635d8536125776d17ea2bdb72690
 2017-12-21 20:36:24 +00:00
Bill Yi
4d65ebd285 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours am: d5a7faea83 -s ours am: bd14c44fd8 -s ours am: f6c335b353 -s ours am: f24783846d -s ours 
am: 29f70cb6fb  -s ours

Change-Id: I3b1f978abd9a3f0511af1df8735f873695e01997
 2017-12-21 20:34:39 +00:00
Bill Yi
ff1ed61f7d Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours am: 51fc07ad61 -s ours am: c344f9b1c7 -s ours am: 39d480e67c -s ours am: 59f4b0c11f -s ours 
am: 6ba039da20  -s ours

Change-Id: I6d3cfb032e8402a6458b83213739fbf11ee78f0d
 2017-12-21 20:33:26 +00:00
Bill Yi
d4d485815e Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours am: 5943ef281a -s ours am: 2c97ca3b62 -s ours am: 934729c535 -s ours am: 37e0c23902 -s ours 
am: b4db20359a  -s ours

Change-Id: I543fbce177f9dc7cbc2448f08e00780e801aff2d
 2017-12-21 20:31:52 +00:00
Bill Yi
e9c82cd00b Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours am: a683975c54 -s ours am: 0bfcd7eef7 -s ours am: f123f221db -s ours am: 95b4c706b8 -s ours 
am: 5dd6a1c735  -s ours

Change-Id: I9c7854ba3ff5cac3da1e39e7fe48ba0b27a06e4a
 2017-12-21 20:30:35 +00:00