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

97625 Commits

Author SHA1 Message Date
Automerger Merge Worker
88522be63c Merge "Added OWNERS file for inputmethod" am: 80e92b670d am: c54682b084 
Change-Id: I09843e792939e9bd2625c8fdf1ca734dd5872f82
 2020-03-14 04:55:44 +00:00
Treehugger Robot
80e92b670d Merge "Added OWNERS file for inputmethod" 2020-03-14 04:22:17 +00:00
Automerger Merge Worker
54c7cff5b5 Merge "Add @RequiresPemission compat framework APIs." am: 9a3446e067 am: e58704e2be 
Change-Id: Ia935f69038e648bbc7b92b3e5c25ba16d9855a31
 2020-03-13 19:50:59 +00:00
Automerger Merge Worker
bce09c81cd Merge "Update Javadoc comments for ConnectivityDiagnostics constants." am: a6d36265c0 am: 06423e391c 
Change-Id: I5e9af3351e6386e09319c8ac049a2700368b7ed3
 2020-03-13 19:48:36 +00:00
Treehugger Robot
9a3446e067 Merge "Add @RequiresPemission compat framework APIs." 2020-03-13 19:10:21 +00:00
Cody Kesting
a6d36265c0 Merge "Update Javadoc comments for ConnectivityDiagnostics constants." 2020-03-13 19:09:18 +00:00
Wale Ogunwale
15ef780c0d Added OWNERS file for inputmethod 
Bug: N/A
Test: N/A
Merged-In: I0dd7bad55dec4f2332d7819d4ccb1e0da7a2d9b7
Change-Id: I0dd7bad55dec4f2332d7819d4ccb1e0da7a2d9b7
(cherry picked from commit ecf66058ea)
 2020-03-13 03:06:12 -07:00
Automerger Merge Worker
87e0daf750 Revert "[Telephony mainline] Add SystemApi and NonNull annotation" am: 85fab6aa74 am: f0bf41cbb9 
Change-Id: Ib6a3f61b181c1be5254072c56d83e208bdaaf15a
 2020-03-13 04:29:18 +00:00
Automerger Merge Worker
600494cca1 Merge "Change naming to be more specific" am: 24b58ed995 am: 25dfef2df8 
Change-Id: I5757915a7374d86a2279cd03f56559a7b3fe844c
 2020-03-13 04:28:53 +00:00
Automerger Merge Worker
f0bf41cbb9 Revert "[Telephony mainline] Add SystemApi and NonNull annotation" am: 85fab6aa74 
Change-Id: I03e82a297fbf18f68ba8cde017e43d06223f5be8
 2020-03-13 04:02:25 +00:00
Zoey Chen
f74abcb43c Merge "Revert "[Telephony mainline] Add SystemApi and NonNull annotation"" 2020-03-13 03:47:49 +00:00
Treehugger Robot
24b58ed995 Merge "Change naming to be more specific" 2020-03-13 03:30:19 +00:00
Automerger Merge Worker
eb82742a4c Merge "Move yesterday/today Strings from LocaleData into a new ICU class" am: 05f3bf50d6 am: c1130c259b 
Change-Id: I22e863e42caafe3a6e40e89b1d498196df963e20
 2020-03-12 18:46:24 +00:00
vichang
05f3bf50d6 Merge "Move yesterday/today Strings from LocaleData into a new ICU class" 2020-03-12 18:17:06 +00:00
Automerger Merge Worker
dd317e5963 Merge "Add javadoc for Network#netId" am: 3294427e9b am: 2677915c8d 
Change-Id: I1adbf90c9ac47d2918123dc3fe587f34c1dbbbb9
 2020-03-12 10:30:33 +00:00
Mark Chien
3294427e9b Merge "Add javadoc for Network#netId" 2020-03-12 09:55:18 +00:00
markchien
34070e84f2 Add javadoc for Network#netId 
Bug: 151156820
Test: m doc-comment-check-docs
Change-Id: Iea34a5c58a8b77c83258a39a8a44601e21a482f5
 2020-03-12 09:54:44 +00:00
Automerger Merge Worker
913397e796 Merge changes from topic "sp20-stats-provider-permission" am: 0fa3b9e2e4 am: 344ecb4200 
Change-Id: I765831bcb6059fa95cf59967becde4b9340cde39
 2020-03-12 09:00:20 +00:00
Junyu Lai
0fa3b9e2e4 Merge changes from topic "sp20-stats-provider-permission" 
* changes:
  [SP20] Check signature permission when accessing network stats provider
  Add permission check functions to NetworkStatsService
 2020-03-12 08:19:24 +00:00
Automerger Merge Worker
c498502c52 Merge "Whitelist telephony broadcasts for bground use" am: 14906e7a11 am: 1d98373962 
Change-Id: I5a00ab5a7b288a8fc921d892bf1be85d9e1992db
 2020-03-12 04:46:10 +00:00
Automerger Merge Worker
2646c4a4ff RESTRICT AUTOMERGE am: 60a6583adf am: 20cd95a7f6 
Change-Id: I7458a6f6a8178f31060e5a0150cddf5d20cc1fdb
 2020-03-12 04:35:43 +00:00
Automerger Merge Worker
889ce3e268 Merge "Camera: Add new hidden API for camera open/close callback" into qt-qpr1-dev am: ca1872dc0d 
Change-Id: Ia2cb5520d80f2bcc3c1d6149ac31c281d24ba720
 2020-03-12 04:35:30 +00:00
Daniel Bright
14906e7a11 Merge "Whitelist telephony broadcasts for bground use" 2020-03-12 04:09:38 +00:00
Daniel Bright
60fe698771 Whitelist telephony broadcasts for bground use 
Whitelisted telephony broadcasts using the intent background flag.
Ensured that each broadcast was protected manually through cts test below.

Bug: 148181747
Bug: 151112539
Test: Switched on ActivityManagerDebugConfig.DEBUG_BACKGROUND_CHECK for SIM_STATE_CHANGED
Test:  android.telephony.cts.TelephonyProtectedBroadcastsTest
Merged-In: Id280fc2128b84dda2a8184dfa32ecc5b8f787afb
Change-Id: Id280fc2128b84dda2a8184dfa32ecc5b8f787afb
 2020-03-11 17:07:23 -07:00
Automerger Merge Worker
7c329bcefa Add updateMccMncConfiguration as @TestApi for CTS am: a14185aad4 am: bd96ea2511 
Change-Id: Iab9b9df58da7080671b240f0e91ae88deade6fe8
 2020-03-11 20:33:36 +00:00
Automerger Merge Worker
2b468ede41 API Council Feedbacks am: 9ae1afee27 am: f4ed9f5712 
Change-Id: I4d0f0e5967942052a1333a518eb07531294fe084
 2020-03-11 20:31:06 +00:00
Automerger Merge Worker
bd96ea2511 Add updateMccMncConfiguration as @TestApi for CTS am: a14185aad4 
Change-Id: I76ada68535d82a6bc338071ded009a4c17ae7d17
 2020-03-11 20:14:59 +00:00
Automerger Merge Worker
f4ed9f5712 API Council Feedbacks am: 9ae1afee27 
Change-Id: I3bb28f7ea417c15ec2662eef4374749ffb595646
 2020-03-11 20:09:58 +00:00
Automerger Merge Worker
20cd95a7f6 RESTRICT AUTOMERGE am: 60a6583adf 
Change-Id: I387d6fcf719b56132baeff486aebce875d76f602
 2020-03-11 20:05:08 +00:00
Shuzhen Wang
ca1872dc0d Merge "Camera: Add new hidden API for camera open/close callback" into qt-qpr1-dev 2020-03-11 19:29:42 +00:00
Shuo Qian
af0d638e98 Merge "Add updateMccMncConfiguration as @TestApi for CTS" 2020-03-11 19:25:12 +00:00
Shuo Qian
e03edaba0e Merge "API Council Feedbacks" 2020-03-11 19:24:35 +00:00
Zoey Chen
85fab6aa74 Revert "[Telephony mainline] Add SystemApi and NonNull annotation" 
Revert "[Telephony Mainline] 1. Move the functionality about blo..."

Revert "[Telephony mainline] Move all METHOD_* constants from Sy..."

Revert "[Telephony mainline] Move the functionality into the cal..."

Revert submission 1175092-1575532679259-3b86bd03

Reason for revert: <Revisit and redesign in S>
Reverted Changes:
I5c4380f93:[Telephony mainline] Move all METHOD_* constants f...
I84bbfc13c:[Telephony mainline] Move METHOD_* constants from ...
I5a53cb416:[Telephony mainline] Move the functionality into t...
I69d1fd77c:[Telephony Mainline] 1. Move the functionality abo...
I619d6ba04:[Telephony mainline] Add SystemApi and NonNull ann...

Change-Id: I379281a1879dddcaae8862c9f970ef57892ecbea
Merged-In: I0749492a5648dfa2fb83271f349a8370972f7032
 2020-03-11 08:23:57 +00:00
Automerger Merge Worker
73d30694fd Merge "Update preferred payment related APIs" am: d9b1353771 am: cde012199e 
Change-Id: I7bfe9f460ba5b2569fd060bd64181fd8b05b0647
 2020-03-11 07:48:46 +00:00
Treehugger Robot
d9b1353771 Merge "Update preferred payment related APIs" 2020-03-11 07:10:57 +00:00
Aaron Huang
ea79b2ec19 Merge "Remove framework code that has moved to frameworks/libs/net" 2020-03-11 04:22:09 +00:00
Jack Yu
d70879e5bb Update preferred payment related APIs 
Add API docs for ACTION_PREFERRED_PAYMENT_CHANGED and the constants(PREFERRED_PAYMENT_*).
Change return type from String to CharSequence for
getDescriptionForPreferredPaymentService.

Test: build pass
Bug: 149998286
Change-Id: Ibe0c77bb25da2673cc8f46cd1e2735c0a1e30523
 2020-03-11 02:51:25 +00:00
Automerger Merge Worker
8dbd8eaef2 Merge "Introduce system API for ActivityManager.updateMccMncConfiguration for Mainline" am: d301f3fd8e am: b3720cd31c 
Change-Id: I73a56d811f4c3ba581298852bbec638b16b510b6
 2020-03-10 23:35:25 +00:00
Automerger Merge Worker
b3720cd31c Merge "Introduce system API for ActivityManager.updateMccMncConfiguration for Mainline" am: d301f3fd8e 
Change-Id: I84bf9ea55419147e2ee414b0451415ed5a40575c
 2020-03-10 23:18:40 +00:00
sqian
a14185aad4 Add updateMccMncConfiguration as @TestApi for CTS 
Test: cts; https://paste.googleplex.com/5930499648258048
Bug: 147897445
Change-Id: I63288be1acd9e898548ced345799ac1ae69ce427
Merged-In: I63288be1acd9e898548ced345799ac1ae69ce427
(cherry picked from commit 3d873cf7d0)
 2020-03-10 22:57:43 +00:00
Christopher Tate
45a53e6cb8 DO NOT MERGE - Kill apps outright for API contract violations 
...rather than relying on in-app code to perform the shutdown.

Bug: 128649910
Bug: 140108616
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Change-Id: I94d9de50bb03c33666471e3dbd9c721e9278f7cb
Merged-In: I94d9de50bb03c33666471e3dbd9c721e9278f7cb
 2020-03-10 22:32:13 +00:00
Shuo Qian
9ae1afee27 API Council Feedbacks 
1) Update doc of ACTION_UPDATE_EMERGENCY_NUMBER_DB
2) Add new APIs EXTRA_VERSION and EXTRA_REQUIRED_HASH
3) Rename isDataConnectionEnabled to IsDataConnectionAllowed
4) Format the API documentations with html format
5) Throw errors for shutdownAllRadios, isAnyRadioPoweredOn
6) Modify the doc of TelephonyManager.getEmergencyNumberDbVersion
7) Add UPDATE_CONFIG permission for ACTION_UPDATE_EMERGENCY_NUMBER_DB

Test: Treehugger; Manual made a call; make -j offline-sdk-docs
Bug: 147696692
Bug: 147805285
Bug: 148217670
Bug: 148218347
Change-Id: Idf3dee3de5ebf75ca8b8fbaaf879e69f7ae4b754
Merged-In: Idf3dee3de5ebf75ca8b8fbaaf879e69f7ae4b754
(cherry picked from commit dc86120fca)
 2020-03-10 21:53:36 +00:00
sqian
9799e6e810 Introduce system API for ActivityManager.updateMccMncConfiguration for Mainline 
Test: treehugger
Bug: 147381728
Bug: 138545688
Change-Id: Ieef1dbbab3b05fc166c3dbc53ed2507ef45d09d7
Merged-In: Ieef1dbbab3b05fc166c3dbc53ed2507ef45d09d7
(cherry picked from commit b9c9bfa6e8)
 2020-03-10 21:29:32 +00:00
Automerger Merge Worker
5a39a31195 Merge "Update permissions of BluetoothPan System APIs and re-hide some APIs that do not need to be System APIs." am: 365caf6f04 am: a05c58f38d 
Change-Id: If3f39232791969764c6bb7060404609180314684
 2020-03-10 21:07:54 +00:00
Automerger Merge Worker
a05c58f38d Merge "Update permissions of BluetoothPan System APIs and re-hide some APIs that do not need to be System APIs." am: 365caf6f04 
Change-Id: Ie43c36ad4012191ddac47f824014150bb0afce7d
 2020-03-10 21:02:56 +00:00
Automerger Merge Worker
ee991b5502 Merge "Add error code for BluetoothDevice#getBatteryLevel to represent Bluetooth is off" am: 1bb18d83eb am: 4e85f7bb92 
Change-Id: Ibc00e82d638cc4307c4356adb79cb7a92c3b70bc
 2020-03-10 21:02:08 +00:00
Treehugger Robot
365caf6f04 Merge "Update permissions of BluetoothPan System APIs and re-hide some APIs that do not need to be System APIs." 2020-03-10 19:13:52 +00:00
Victor Chang
b8fd6681b5 Move yesterday/today Strings from LocaleData into a new ICU class 
Note that the strings are no longer cached here to avoid permanent
app Java heap growth due to strong cache. Consider that no user of DateSorter
exists in the platform, and the API is legacy. The impact on app performance
is expected to be very low.

Bug: 144560585
Bug: 138994281
Test: atest CtsWebkitTestCases:android.webkit.cts.DateSorterTest
Change-Id: I659d430901cf1838befc0a35f5188d069169e824
 2020-03-10 18:51:21 +00:00
Shuzhen Wang
e375ee8f8a Camera: Add new hidden API for camera open/close callback 
The hidden API is used by SystemUI process to adjust the system UI based
on when a certain camera is opened or closed.

Test: Manually observe callbacks in SystemUI when running camera CTS
Bug: 150540299
Change-Id: I04cae782d96f0e32be8ef588dcd328f84b32887a
Merged-In: I04cae782d96f0e32be8ef588dcd328f84b32887a
 2020-03-10 11:34:26 -07:00
Automerger Merge Worker
4e85f7bb92 Merge "Add error code for BluetoothDevice#getBatteryLevel to represent Bluetooth is off" am: 1bb18d83eb 
Change-Id: I6b99985c7ee2eb9a9b388dd5270365271a380ced
 2020-03-10 17:47:29 +00:00