Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
384,755 Commits 3 Branches 0 Tags
8a4e2f3aebbde591e23c1d76c174e0588c243f4e
Commit Graph

384755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deqiang Chen
8a4e2f3aeb Merge "Avoid IllegalArgumentException when bluetooth is disabled" am: 2a1bdd2429 
am: 787e52045f

Change-Id: I3f55d6e7b56170ee4cafaf60e7ef8b908080c182
 2019-03-14 15:53:21 -07:00
Deqiang Chen
787e52045f Merge "Avoid IllegalArgumentException when bluetooth is disabled" 
am: 2a1bdd2429

Change-Id: I536b4ca701bed102c5c2914a6dbfa2393a646c6d
 2019-03-14 15:41:33 -07:00
Shuo Qian
a2d4a163db Merge "Explain the difference of isValid, isActive, isUsable" am: 9c649215f6 
am: 614f1e0bba

Change-Id: Ia4f968479973a9fb5f1ccdf78145d7fc2429ef0a
 2019-03-14 15:30:10 -07:00
Deqiang Chen
2a1bdd2429 Merge "Avoid IllegalArgumentException when bluetooth is disabled" 2019-03-14 22:23:18 +00:00
Shuo Qian
614f1e0bba Merge "Explain the difference of isValid, isActive, isUsable" 
am: 9c649215f6

Change-Id: I8146a074fa87747e91a22da4a4bfb696dcc7deef
 2019-03-14 15:20:03 -07:00
Shuo Qian
9c649215f6 Merge "Explain the difference of isValid, isActive, isUsable" 2019-03-14 22:05:46 +00:00
sqian
0bcdd6cbd4 Explain the difference of isValid, isActive, isUsable 
Bug: 118675257
Test: compile
Change-Id: Ibec1bf7929991ca0e2910684f5216ab8372d4e95
 2019-03-14 11:34:01 -07:00
Benedict Wong
db34163526 Merge "Add MANAGE_TEST_NETWORKS permission as @hide" am: 96f51fd970 
am: 7a66b02e62

Change-Id: I1999d3c8c517f3f1369005b986f18105ef793dab
 2019-03-14 11:15:14 -07:00
Benedict Wong
7a66b02e62 Merge "Add MANAGE_TEST_NETWORKS permission as @hide" 
am: 96f51fd970

Change-Id: Ia5e9f3e7ba7024151d0f4fa595bf66daaa0fc948
 2019-03-14 10:59:14 -07:00
Benedict Wong
96f51fd970 Merge "Add MANAGE_TEST_NETWORKS permission as @hide" 2019-03-14 17:39:21 +00:00
Nikita Ioffe
36abd0a7e8 Merge "Add a whitelist to control packages that can use Bugreporting API" am: 17492d0691 
am: e54c0344de

Change-Id: I8545743ebce6206b2b8d747eb252a31282bc86cf
 2019-03-14 03:34:30 -07:00
Nikita Ioffe
e54c0344de Merge "Add a whitelist to control packages that can use Bugreporting API" 
am: 17492d0691

Change-Id: If224c6522c89c53cb1d5e72a55d5aa051a4e0d02
 2019-03-14 03:23:08 -07:00
Treehugger Robot
17492d0691 Merge "Add a whitelist to control packages that can use Bugreporting API" 2019-03-14 10:13:32 +00:00
Chen Xu
c7fb8914b6 Merge "fix the issue that setPreferredNW send wrong RAT to HAL" am: 4837dbe536 
am: 3a720c6739

Change-Id: I2245e9a0fd7afac8835dbf1ead499153efa39e36
 2019-03-13 18:13:58 -07:00
Chen Xu
3a720c6739 Merge "fix the issue that setPreferredNW send wrong RAT to HAL" 
am: 4837dbe536

Change-Id: I33e98b0f4ac9b0d7130b9e6b25fec5b76409e021
 2019-03-13 18:04:44 -07:00
Chen Xu
4837dbe536 Merge "fix the issue that setPreferredNW send wrong RAT to HAL" 2019-03-14 00:47:07 +00:00
Todd Kennedy
dc65b65666 Change target SDK to '28' 
am: b0103b5ebb

Change-Id: If4e9acb9fef17a38013d532196a06091446f5bb2
 2019-03-13 16:49:14 -07:00
Joe Onorato
1ec34e0032 Merge "Add me to owners for batterystats." am: 274ce2d831 
am: b5c0c5b1e8

Change-Id: Ifc47542faa17acc3da46826da0da09c981fc5066
 2019-03-13 15:14:10 -07:00
Iris Chang
88768902b3 Merge "Should return the number of supported SIM cards" am: 09a4ee1988 
am: 52688c33ee

Change-Id: I122d3f77a55ae27005531bfe490ad35213892b4f
 2019-03-13 15:08:01 -07:00
Joe Onorato
b5c0c5b1e8 Merge "Add me to owners for batterystats." 
am: 274ce2d831

Change-Id: I778b676a418817917421fc0794793131e5fd5d3f
 2019-03-13 15:01:44 -07:00
Iris Chang
52688c33ee Merge "Should return the number of supported SIM cards" 
am: 09a4ee1988

Change-Id: Ia8d237fa510ca47c4fcd04a7d28812612e01d248
 2019-03-13 14:57:06 -07:00
Hall Liu
c3557eb639 Merge "Fix issues associated with hold failure" am: df6e5604f3 
am: 9fefce6df5

Change-Id: Ib736c4b26fac7262727873cdccd510927226f8f9
 2019-03-13 14:45:42 -07:00
Treehugger Robot
274ce2d831 Merge "Add me to owners for batterystats." 2019-03-13 21:45:28 +00:00
Hall Liu
9fefce6df5 Merge "Fix issues associated with hold failure" 
am: df6e5604f3

Change-Id: I0c3ca2ef55a67b1f2c00f19635dcfd8ed0bbedea
 2019-03-13 14:32:28 -07:00
Steven Moreland
bcf1be1c91 Merge "Use jarjar rules for framework.jar." am: b70a6cbf9a 
am: 4382755210

Change-Id: Ib36a2c578ce37876dd1c544f471987b9a32bdc5a
 2019-03-13 14:20:38 -07:00
Treehugger Robot
09a4ee1988 Merge "Should return the number of supported SIM cards" 2019-03-13 21:18:57 +00:00
Hall Liu
df6e5604f3 Merge "Fix issues associated with hold failure" 2019-03-13 21:18:53 +00:00
Steven Moreland
4382755210 Merge "Use jarjar rules for framework.jar." 
am: b70a6cbf9a

Change-Id: I85027c5a87f9acd2c67a804bcfe8c3f7346fdbc3
 2019-03-13 14:06:12 -07:00
Steven Moreland
b70a6cbf9a Merge "Use jarjar rules for framework.jar." 2019-03-13 20:52:37 +00:00
Todd Kennedy
b0103b5ebb Change target SDK to '28' 
Bug: 121306802
Test: none
Change-Id: I3e7302ab42987c177f9e538fd7fdf66c35f0bb79
 2019-03-13 13:37:33 -07:00
chen xu
14778d38e8 fix the issue that setPreferredNW send wrong RAT to HAL 
Bug: 126805258
Test: Manual test to set LTE only mode
Change-Id: I2e88d3bc22ca8d1e626bf381840cc80f832a8b3f
 2019-03-13 13:34:00 -07:00
Joe Onorato
ea435f81ad Add me to owners for batterystats. 
I do solemnly swear that other powers I get incidentally will be
used carefully.

Test: none
Bug: 123732427
Change-Id: I672f5f10b32646b8beb3e9692ed131019c391593
 2019-03-13 12:16:07 -07:00
Soonil Nagarkar
906f80cb3b [automerger skipped] Merge "DO NOT MERGE Let isLocationEnabledForUser() return true location setting" am: a4dac05210 -s ours 
am: 99d0681a6f -s ours
am skip reason: subject contains skip directive

Change-Id: I330716725c4672c60aaa44c9d5d30a241832a2fa
 2019-03-13 12:10:26 -07:00
Soonil Nagarkar
99d0681a6f [automerger skipped] Merge "DO NOT MERGE Let isLocationEnabledForUser() return true location setting" 
am: a4dac05210 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie3e765b2be88f06a3c97da4371f87b6c62a87f81
 2019-03-13 12:03:30 -07:00
Treehugger Robot
a4dac05210 Merge "DO NOT MERGE Let isLocationEnabledForUser() return true location setting" 2019-03-13 18:52:35 +00:00
Alan Stokes
aa3e146ac1 Merge "Add alanstokes as owner of DynamicCodeLoggingService." am: b9478c48cf 
am: 5b2f518c5a

Change-Id: I38ead254c408e312395629db68b40479fc6403c9
 2019-03-13 11:25:55 -07:00
Alan Stokes
5b2f518c5a Merge "Add alanstokes as owner of DynamicCodeLoggingService." 
am: b9478c48cf

Change-Id: I89f934fcf528cc30e09c9920d12d1b30d4ac5041
 2019-03-13 11:13:32 -07:00
Treehugger Robot
b9478c48cf Merge "Add alanstokes as owner of DynamicCodeLoggingService." 2019-03-13 18:01:46 +00:00
Leland Miller
826516c579 Merge "Annotate Parcelable CREATOR fields as @NonNull" am: 8ced10ec23 
am: 83c77f688a

Change-Id: Idbe3b03a8345db85b7e32d4e7198a78c1df42270
 2019-03-13 10:45:36 -07:00
Leland Miller
83c77f688a Merge "Annotate Parcelable CREATOR fields as @NonNull" 
am: 8ced10ec23

Change-Id: I89a5c242a85c0e0d19f98fc5db9fa87b0a48815a
 2019-03-13 10:35:32 -07:00
Leland Miller
8ced10ec23 Merge "Annotate Parcelable CREATOR fields as @NonNull" 2019-03-13 17:23:12 +00:00
Steven Moreland
840d9c02b7 Merge changes from topic "hidl-updater-system" am: 5a490d4bb7 
am: cfea213006

Change-Id: Ida737ee8bdadbacc656e9f6b96f29d793089e695
 2019-03-13 10:21:31 -07:00
Steven Moreland
cfea213006 Merge changes from topic "hidl-updater-system" 
am: 5a490d4bb7

Change-Id: I1fe4f587bb5f7452752ea3c7fc23635fb4a8aee2
 2019-03-13 10:11:57 -07:00
Nikita Ioffe
ee4d7be219 Add a whitelist to control packages that can use Bugreporting API 
Test: checked SecurityException is thrown for my custom app
Test: whiltelisted my custom app, checked no SecurityException is thrown
Bug: 126541701
Change-Id: Id0b61ccc1adf40bcb455d3b59b640f4b160bdd84
Merged-In: Id0b61ccc1adf40bcb455d3b59b640f4b160bdd84
(cherry picked from commit 07964b49ac)
 2019-03-13 17:01:56 +00:00
Steven Moreland
5a490d4bb7 Merge changes from topic "hidl-updater-system" 
* changes:
  pm: AndroidHidlUpdater: system only
  pm: PackageBackwardCompatibility -> applyPolicy
 2019-03-13 16:51:30 +00:00
Siarhei Vishniakou
7f0cff2673 Merge "Add Nullable annotation to getDecorView" am: a018254b45 
am: b812cec859

Change-Id: I13b43231caaca17dfa3f67c9d77c0792a77f6e3b
 2019-03-13 09:39:19 -07:00
Siarhei Vishniakou
b812cec859 Merge "Add Nullable annotation to getDecorView" 
am: a018254b45

Change-Id: I50847403490455560f6c7db41db494bab3bc44f8
 2019-03-13 09:29:55 -07:00
Treehugger Robot
a018254b45 Merge "Add Nullable annotation to getDecorView" 2019-03-13 16:09:00 +00:00
Tyler Gunn
4b4d6f3072 Merge "Remove support for event-based handovers." am: b2c1daf861 
am: 3e232b28af

Change-Id: I6119eb289794ac658196fd7b25863c1404807fc3
 2019-03-13 08:27:02 -07:00
Tyler Gunn
3e232b28af Merge "Remove support for event-based handovers." 
am: b2c1daf861

Change-Id: I03aea3dffd4a7d1af24d281826f87945441d6d14
 2019-03-13 08:17:56 -07:00