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

30156 Commits

Author SHA1 Message Date
Automerger Merge Worker
a6bc2f04e0 Merge "Hide setDisabledForSimNetworkLock" into rvc-dev am: e6045973f7 
Change-Id: I44889276c3cec850a91b11b3eea912acbcb1f156
 2020-03-16 20:49:23 +00:00
Hall Liu
e6045973f7 Merge "Hide setDisabledForSimNetworkLock" into rvc-dev 2020-03-16 20:45:58 +00:00
Automerger Merge Worker
206f0380f7 Merge "[Quick Access Wallet] Update docs, remove debug logs, and fix lint errors" into rvc-dev am: 8c40228417 
Change-Id: I3c4b9fb10377aafec88e452073dda1b58454cdd1
 2020-03-16 20:43:27 +00:00
Automerger Merge Worker
3ac362c32b Merge "Re-hide OPSTR_READ_DEVICE_IDENTIFIERS" into rvc-dev am: 61d30d7d98 
Change-Id: Icc2792167bb225debf8567e1a90fc86c887c5099
 2020-03-16 20:43:07 +00:00
Automerger Merge Worker
6f94e125e2 Merge "Remove @SystemApi from some constants for R." into rvc-dev am: c48113aa14 
Change-Id: Id20d5c4d02220c3fa709f36eb7b00f89a9cdfd61
 2020-03-16 20:42:47 +00:00
Sean Pont
8c40228417 Merge "[Quick Access Wallet] Update docs, remove debug logs, and fix lint errors" into rvc-dev 2020-03-16 20:40:03 +00:00
Hall Liu
61d30d7d98 Merge "Re-hide OPSTR_READ_DEVICE_IDENTIFIERS" into rvc-dev 2020-03-16 20:37:27 +00:00
Sean Pont
9d4fb03671 [Quick Access Wallet] Update docs, remove debug logs, and fix lint errors 
Bug: 150134429
Bug: 149580068
Test: atest CtsQuickAccessWalletTestCases
Change-Id: I2173b270950a9174b7be67461ef8821ecde91194
 2020-03-16 13:37:21 -07:00
Amit Mahajan
c48113aa14 Merge "Remove @SystemApi from some constants for R." into rvc-dev 2020-03-16 20:35:00 +00:00
Automerger Merge Worker
6958aba1ea Merge "Remove haptic primitives that aren't ready yet." into rvc-dev am: 6bd4a7edb8 
Change-Id: I556de1b125064143eb66030146251a379b340f8a
 2020-03-16 19:27:06 +00:00
TreeHugger Robot
6bd4a7edb8 Merge "Remove haptic primitives that aren't ready yet." into rvc-dev 2020-03-16 19:16:48 +00:00
Automerger Merge Worker
7676bd5deb Merge "Revert "Revert "WindowInsetsController: Address API feedback""" into rvc-dev am: 146db0e46b 
Change-Id: I966dc0f349a182882e847ed9f76b0bb602489d26
 2020-03-16 17:24:34 +00:00
Michael Wright
8fc2be555d Remove haptic primitives that aren't ready yet. 
We have some concerns about a couple of the primitives we're exposing,
so rather than risk committing to an API surface that we may regret and
aren't 100% confident in the implementation of, lets hide it and keep
them for private usage for now.

Also, rename LIGHT_TICK to TICK; we shouldn't expose the internal
differences to users since it just makes the whole surface more
complicated to explain.

Fixes: 151085071
Fixes: 151261619
Test: N/A
Change-Id: I2872e8f52202d6192de6aa7e3081778486174f4e
 2020-03-16 17:06:10 +00:00
Adrian Roos
146db0e46b Merge "Revert "Revert "WindowInsetsController: Address API feedback""" into rvc-dev 2020-03-16 17:03:31 +00:00
Automerger Merge Worker
b8f4c5aba1 Merge "API Review: Make ImsReasonInfo in ImsMmTelManager @NonNull" into rvc-dev am: 3bdd15fbb4 
Change-Id: I056d21b983a3a0a2185a6b6dbbc7430d5aa34fba
 2020-03-16 16:03:03 +00:00
Brad Ebinger
3bdd15fbb4 Merge "API Review: Make ImsReasonInfo in ImsMmTelManager @NonNull" into rvc-dev 2020-03-16 15:59:29 +00:00
Automerger Merge Worker
abaab9f87e Merge "Add a new test API for getting the list of approved rule providers." into rvc-dev am: 74739ff81b 
Change-Id: Id67b84abdc5d7e3fa86ea266a17223dd8bdf2e8b
 2020-03-16 12:52:10 +00:00
TreeHugger Robot
74739ff81b Merge "Add a new test API for getting the list of approved rule providers." into rvc-dev 2020-03-16 12:35:42 +00:00
Automerger Merge Worker
e59c2475b8 Merge changes I801ddc49,Id1b8f41b am: ba350f4652 am: 16e7eb9224 
Change-Id: Ib25ca9a843f19fb3791afbe23c065a0a7bb3b11f
 2020-03-16 11:56:41 +00:00
Treehugger Robot
ba350f4652 Merge changes I801ddc49,Id1b8f41b 
* changes:
  [SP24] Rename functions that add Entry unconditionally
  [SP23] Address misc API review comment about NetworkStats
 2020-03-16 11:38:00 +00:00
Zoey Chen
eff8e993c7 Merge "[TelephonyMainline] @hide system api since we'll revisit in S - Cdma" 2020-03-16 11:27:42 +00:00
Mark Chien
c78bf0038e Merge "Change TetheringConstants class to final" into rvc-dev 2020-03-16 09:18:59 +00:00
Automerger Merge Worker
0b4601a332 Merge "[TelephonyMainline] @hide system api since we'll revisit in S - Cdma" into rvc-dev am: d83ee3ebfb 
Change-Id: I4afd81cef081c0d04b0953b4bec4e6992ca24dd9
 2020-03-16 08:11:44 +00:00
Zoey Chen
d83ee3ebfb Merge "[TelephonyMainline] @hide system api since we'll revisit in S - Cdma" into rvc-dev 2020-03-16 08:05:07 +00:00
Automerger Merge Worker
54a85999d6 Change TetheringConstants class to final 
Bug: 151322331
Test: m doc-comment-check-docs

Change-Id: Ieca36d81b7799988b8dbb9c0d22de690136303ab
Merged-In: Ia02be3d1d91a08ae4a56b25560ed448c96a693db
(cherry picked from commit 5e2740b246)
 2020-03-16 07:43:05 +00:00
junyulai
c7e614d0f3 [SP23] Address misc API review comment about NetworkStats 
This change add several javadoc for NetworkStats and its Entry
class. Also remove IFACE_ALL constant accordlingly.

Test: atest FrameworkNetTests
Test: m doc-comment-check-docs
Bug: 148895143
Change-Id: Id1b8f41be79f847ad73197ff0e18258b6ee8a730
 2020-03-16 14:27:45 +08:00
Automerger Merge Worker
fb4e98fa77 Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: 56023af973 
Change-Id: I72f00d09e74eb0de1d837a29a2b869a4de45178d
 2020-03-16 05:53:15 +00:00
Paul Hu
bd9b91acbb Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev 2020-03-16 05:48:33 +00:00
zoey chen
b81b4e5cd8 [TelephonyMainline] @hide system api since we'll revisit in S - Cdma 
Test: make
Bug: 148404061
Change-Id: I83dbaa24f94f5cca846d6ca71c7e6814ecd832b8
Merged-In: I83dbaa24f94f5cca846d6ca71c7e6814ecd832b8
 2020-03-16 05:48:10 +00:00
Aaron Huang
56023af973 Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev 2020-03-16 05:47:34 +00:00
Automerger Merge Worker
d0d7946c7a Merge "Change TetheringConstants class to final" am: 2f92c8d46c am: 34c9af30f9 
Change-Id: I5c4a3c1b011b6a0eeda8473b9206c4adf307c168
 2020-03-16 05:47:02 +00:00
zoey chen
834b281fa5 [TelephonyMainline] @hide system api since we'll revisit in S - Cdma 
Test: make
Bug: 148404061
Change-Id: I83dbaa24f94f5cca846d6ca71c7e6814ecd832b8
 2020-03-16 13:46:17 +08:00
Automerger Merge Worker
c2897d27c0 Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - IccLock" into rvc-dev am: 83afbeec0a 
Change-Id: I67f46193388f61a9d09bd31a659f1e46d3453ae5
 2020-03-16 05:33:44 +00:00
Zoey Chen
83afbeec0a Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - IccLock" into rvc-dev 2020-03-16 05:26:58 +00:00
Mark Chien
2f92c8d46c Merge "Change TetheringConstants class to final" 2020-03-16 05:25:40 +00:00
Automerger Merge Worker
ea27babbe5 Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - DataAllowed" into rvc-dev am: 365dfedd5a 
Change-Id: Id622807215d7697221e267580f5c8c9d02962e68
 2020-03-16 05:13:02 +00:00
Zoey Chen
365dfedd5a Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - DataAllowed" into rvc-dev 2020-03-16 05:11:50 +00:00
Automerger Merge Worker
c27bc21c71 Merge "Add final to MediaRouter2" into rvc-dev am: ccd4db5e16 
Change-Id: I46ca2a91a1f3bf75804adc388c5ef7ab4c46012c
 2020-03-16 04:06:48 +00:00
Kyunglyul Hyun
ccd4db5e16 Merge "Add final to MediaRouter2" into rvc-dev 2020-03-16 04:05:10 +00:00
Automerger Merge Worker
3f8d933cb4 [SP21] Address comments for API council review about aosp/1172143 am: 393e10d4cd am: c13c880914 
Change-Id: I86cf3b57722f64c0989ce606fde71d6173f812bb
 2020-03-16 03:14:01 +00:00
Automerger Merge Worker
c13c880914 [SP21] Address comments for API council review about aosp/1172143 am: 393e10d4cd 
Change-Id: I8634d6f6ed65ec6b10009a90b147881fe1fc4530
 2020-03-16 03:03:51 +00:00
Junyu Lai
240f5bb4e9 Merge "[SP21] Address comments for API council review about aosp/1172143" 2020-03-16 02:41:19 +00:00
Automerger Merge Worker
a83723ad60 Merge "SurfaceControlViewHost: Respond to API feedback" into rvc-dev am: 1660402a5c 
Change-Id: I2191e64080621870aa0d859e6b8a3fb30e05f412
 2020-03-16 02:37:41 +00:00
TreeHugger Robot
1660402a5c Merge "SurfaceControlViewHost: Respond to API feedback" into rvc-dev 2020-03-16 02:24:49 +00:00
Automerger Merge Worker
0c8be9e2a3 Merge "rename getFec() to getInnerFec()" into rvc-dev am: 397a93168a 
Change-Id: Ic8db3e915c47c393e72105752835e2011fda6552
 2020-03-16 00:51:04 +00:00
TreeHugger Robot
397a93168a Merge "rename getFec() to getInnerFec()" into rvc-dev 2020-03-16 00:42:57 +00:00
Automerger Merge Worker
289f27ae27 Merge "Rename get/setProtectedPackages methods" into rvc-dev am: 777531511f 
Change-Id: Iade092f0c9979d71afe40339dc2c60ebecad52c8
 2020-03-15 23:11:50 +00:00
TreeHugger Robot
777531511f Merge "Rename get/setProtectedPackages methods" into rvc-dev 2020-03-15 23:05:42 +00:00
markchien
070c260a65 Change TetheringConstants class to final 
Bug: 151322331
Test: m doc-comment-check-docs
Change-Id: Ia02be3d1d91a08ae4a56b25560ed448c96a693db
 2020-03-15 22:54:57 +08:00
Automerger Merge Worker
08f6efd365 Merge "Introduce per-app API for installer whitelisting" into rvc-dev am: 41b448e39b 
Change-Id: I35d7c7ea7fef3b7f777ed9d60844763b7d651a4c
 2020-03-14 05:56:56 +00:00