Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
437,815 Commits 3 Branches 0 Tags
255cd441c2f90b519dcb74365ebeb9cf076b32f2
Commit Graph

437815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chalard Jean
8f0513bd0b Merge "Cut the dependency to APN constants" 2019-11-21 12:37:33 +00:00
Artur Satayev
9dadbaa617 Add OWNERS for frameworks/base/config/hiddenapi*. 
Test: N/A
Change-Id: Iaf914899686ea6e8be7462f0c1df0646c4fa69b0
Merged-In: Iaf914899686ea6e8be7462f0c1df0646c4fa69b0
 2019-11-21 12:21:12 +00:00
vichang
c27cc4041b Merge "Deprecate the use of ICU.addLikelySubtags" 
am: 986c242b7a

Change-Id: I86af54c4b0ca2d311a3ef1290972b47b5ddb0f8b
 2019-11-21 04:05:33 -08:00
Andrei Onea
bcd09ba70c Add metrics constant for platform compat UI. 
Bug: 138280620
Test: builds
Merged-In: I1a1a708596ad003a7c95906fe9514db6ec518dfc
Change-Id: I1a1a708596ad003a7c95906fe9514db6ec518dfc
 2019-11-21 11:51:59 +00:00
vichang
986c242b7a Merge "Deprecate the use of ICU.addLikelySubtags" 2019-11-21 11:25:28 +00:00
Chalard Jean
ed4371c546 Merge changes I52f70756,Icc621f0a 
am: 0a8b713266

Change-Id: Idd877fbaaec711e379e3387efb5810e14508f2a1
 2019-11-21 00:48:38 -08:00
Chalard Jean
0a8b713266 Merge changes I52f70756,Icc621f0a 
* changes:
  [NS A08] Tiny refactoring
  [NS A07] Move the last side effects out of the decision loop.
 2019-11-21 08:32:35 +00:00
Chalard Jean
c06d788ec9 Cut the dependency to APN constants 
With Telephony moving to Mainline these constants are not accessible
any more, and should not be made public. As they are only used by
a deprecated method that can only be called by apps with a target
SDK < M and only for one of the features it used to handle, copying
the constants until this method is completely removed is the simplest
way to go.

Test: FrameworksNetTests
Bug: 144454341
Change-Id: Iea18c8d2f2c8a40f04db9383d3f74b917267ba25
 2019-11-21 14:48:00 +09:00
Daniel Colascione
1077797c14 Merge changes from topic "property-handle" 
am: 54543bb423

Change-Id: Id1ebdeca53c8705ce3cfab8db2e25cfebaa7f8a3
 2019-11-20 20:47:44 -08:00
Meng Wang
f1b067c671 Merge "Use TelephonyManager instead of ITelephony Binder" 
am: de953fd5f2

Change-Id: I6172adeb2489abede44555b17340a6e58e23fafe
 2019-11-20 20:44:19 -08:00
Daniel Colascione
54543bb423 Merge changes from topic "property-handle" 
* changes:
  Add new SystemProperties.Handle interface
  Reimplement android.os.SystemProperties in terms of libc facilities
 2019-11-21 04:38:03 +00:00
Meng Wang
de953fd5f2 Merge "Use TelephonyManager instead of ITelephony Binder" 2019-11-21 04:36:10 +00:00
Chalard Jean
b492ba5333 Merge changes I493b969c,I7b759425,I60fe318a,Ie4ae6a97,I2379e47b, ... 
am: e2427502f1

Change-Id: Ic5b59cb5e23feaf7aac0075f16afa3da94d3628c
 2019-11-20 20:08:51 -08:00
Chalard Jean
e2427502f1 Merge changes I493b969c,I7b759425,I60fe318a,Ie4ae6a97,I2379e47b, ... 
* changes:
  [NS A06] Move more side effects out of the decision loop
  [NS A05] Move some side effects out of the network decision loop
  [NS A04] Store changes in rematchNetworkAndRequests in a map
  [NS A03] Remove mNetworkForRequestId
  [NS A02] Move the contents of mNetworkForRequestId to NRIs
  [NS A01] Add checks for the handler thread
 2019-11-21 04:00:19 +00:00
Jack Yu
7b76848f90 Merge "SubscriptionManager: Cache created resources" 
am: f91923ff9d

Change-Id: I783003109debfaac5afabf8cd977c7e4c1a39eca
 2019-11-20 17:13:46 -08:00
Jack Yu
f91923ff9d Merge "SubscriptionManager: Cache created resources" 2019-11-21 01:07:33 +00:00
Jack Yu
ccf305e76f Merge "telephony annotations part 2" 
am: 1a9f2d0e78

Change-Id: I99e956fc3766bbb585c7e7315142ee43de95ce23
 2019-11-20 17:02:30 -08:00
Jack Yu
1a9f2d0e78 Merge "telephony annotations part 2" 2019-11-21 00:57:13 +00:00
Makoto Onuki
6b1e9d2f9f Explicitly take flags in createContextAsUser() 
Bug: 142472686
Test: atest android.content.cts.ContextTest#testCreateContextAsUser
Change-Id: Id2e3d5ffe5887a4916e0872a7e85d62cbb439744
(cherry picked from commit e5449f0b34)
Merged-in: Id2e3d5ffe5887a4916e0872a7e85d62cbb439744
 2019-11-20 16:20:23 -08:00
Bookatz
deddeea432 Update OWNERS for some server/pm/User files 
Update to OWNERS file for the files
UserSystemPackageInstaller.java
UserTypeDetails.java
UserTypeFactory.java

Test: none
Change-Id: I593c4364d8639f09ecca1efa5f0d41c635c0f3c0
 2019-11-20 16:15:36 -08:00
Kenny Root
53bb6db434 Merge "Move RecoverySystemService into its own package" 
am: 9164399321

Change-Id: Iaa931ad488b059c981646fc6684c782e47a1edf3
 2019-11-20 16:04:50 -08:00
Chen Xu
2105a42191 expose systemAPI for SmsCbLocation constructor 
Bug: 135956699
Test: cts SmsCbLocationTest
Change-Id: I7b9c6fa453ee907aaa13d65e0b13de0556852313
(cherry picked from commit 8635f37b96)
Merged-in: I7b9c6fa453ee907aaa13d65e0b13de0556852313
 2019-11-20 15:53:02 -08:00
Kenny Root
9164399321 Merge "Move RecoverySystemService into its own package" 2019-11-20 23:37:17 +00:00
Daniel Rosenberg
e7b214ce34 Use mContext directly, and enforce via logging 
We already have the context saved, so we can just use that.
Add a log statement so we can test for the existence of this patch from
a CTS test.

Test: Edited code to force expection path to be called, confirmed
      reboot happens
Bug: 138952436
Bug: 140111727
Bug: 144312171

Change-Id: Iaceec82d4716837158d1233400b4a44cbf67a5e8
Merged-In: Iaceec82d4716837158d1233400b4a44cbf67a5e8
 2019-11-20 22:47:56 +00:00
Jordan Liu
277ea3584f Merge "Remove unneeded @RequiresPermission annotation" 
am: 0a1b47573e

Change-Id: I47d83e0d224cb9840b326212f84c83a8e16c1a85
 2019-11-20 14:22:03 -08:00
Chen Xu
b6d1319d1a telephony annotations part 2 
adding missing annotations

Bug: 140908357
Test: Build

Merged-In: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
Change-Id: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
(cherry picked from commit f85cf993d3)
 2019-11-20 14:09:16 -08:00
Andrei-Valentin Onea
0c7dcba3e2 Merge "Add metrics constant for platform compat UI." into stage-aosp-master 2019-11-20 22:06:30 +00:00
Jordan Liu
0a1b47573e Merge "Remove unneeded @RequiresPermission annotation" 2019-11-20 22:04:20 +00:00
Makoto Onuki
056b8f00b7 Merge "Add Context.createContextAsUser()" 
am: 63d5e4a0b9

Change-Id: I022daba2bc9234ffe7b7fa760942a58852e406b3
 2019-11-20 14:04:20 -08:00
Treehugger Robot
63d5e4a0b9 Merge "Add Context.createContextAsUser()" 2019-11-20 21:53:01 +00:00
Andrei Onea
e9e83a5554 Add metrics constant for platform compat UI. 
Bug: 138280620
Test: builds
Exempt-From-Owner-Approval: Cherry-pick
Merged-In: I1a1a708596ad003a7c95906fe9514db6ec518dfc
Change-Id: I1a1a708596ad003a7c95906fe9514db6ec518dfc
 2019-11-20 19:10:57 +00:00
Kenny Root
f96836ed3a Move RecoverySystemService into its own package 
This helps reviewing the refactor of the RecoverySystemService in which it
is made a bit more testable.

Test: make && emulator
Change-Id: Ifc5a658fe68ed10ab400f43d1d3967c0acccbd11
 2019-11-20 10:53:39 -08:00
David Su
e51ae1566b NetworkKey: migrate from ScanResult.wifiSsid to SSID 
wifiSsid is an @hide field, migrate to getter method.

Bug: 144311098
Test: atest NetworkKeyTest
Change-Id: Ic689e12b8de4af52fae26c25bc90c8eb093ad3fe
Merged-In: Ic689e12b8de4af52fae26c25bc90c8eb093ad3fe
 2019-11-20 10:41:59 -08:00
James Mattis
fa968e9691 Merge "Swap param order in registerSoftApCallback" 
am: 1dcfd69218

Change-Id: Icfb927efccdab7adda38ca71c30564a29cad785f
 2019-11-20 10:32:33 -08:00
James Mattis
1dcfd69218 Merge "Swap param order in registerSoftApCallback" 2019-11-20 18:16:53 +00:00
Meng Wang
910d4e982a Merge "Expose IMSI encryption info APIs as system API" 
am: 0209217e33

Change-Id: Iafce568b8ea8cfc5d499dc21b5bbdc738cbfd3fd
 2019-11-20 10:07:06 -08:00
Meng Wang
a73bed81ae Use TelephonyManager instead of ITelephony Binder 
Bug: 140908357
Test: make
Change-Id: If3be915329cc27c560af3fd71a903984a626aca8
 2019-11-20 10:05:33 -08:00
Artur Satayev
37a33f67a0 Merge "Move resource IDs to greylist-max-q." 
am: c6d4f0dd69

Change-Id: I489fdbe0b6b7ec1a3096b6170645e4227343ce7b
 2019-11-20 10:04:24 -08:00
Meng Wang
0209217e33 Merge "Expose IMSI encryption info APIs as system API" 2019-11-20 17:57:08 +00:00
Treehugger Robot
c6d4f0dd69 Merge "Move resource IDs to greylist-max-q." 2019-11-20 17:51:55 +00:00
Charles Munger
5c239c7e95 Merge "Include androidx stubs in framework docs" 
am: acd388baf2

Change-Id: I0977797502e1a4223463a524beda8c035dbdc69f
 2019-11-20 09:42:01 -08:00
Treehugger Robot
acd388baf2 Merge "Include androidx stubs in framework docs" 2019-11-20 17:32:09 +00:00
Steven Moreland
ee46efcad7 Merge changes from topic "rm-vibrator-1.4-pass-2" 
am: 8fee0722bd

Change-Id: I9fe10c243fc615208a6250fed6c9f33c9c54ec02
 2019-11-20 08:57:22 -08:00
Artur Satayev
45628328b0 Move resource IDs to greylist-max-q. 
go/cleanup-greylist-txt

Bug: 137350495
Test: m, manual inspection of out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: I851236a8060e05724833d9dbcd4c5a79763d4c40
Merged-In: I851236a8060e05724833d9dbcd4c5a79763d4c40
 2019-11-20 16:56:22 +00:00
Steven Moreland
8fee0722bd Merge changes from topic "rm-vibrator-1.4-pass-2" 
* changes:
  Remove vibrator@1.4
  VibratorService: avoid shim
 2019-11-20 16:46:33 +00:00
Dario Freni
62637979e4 Merge changes from topic "apks_in_apex" 
am: a8ce56e23f

Change-Id: I0373f86833f35ed61c3138d8f26d63667db03d7f
 2019-11-20 08:07:42 -08:00
Dario Freni
a8ce56e23f Merge changes from topic "apks_in_apex" 
* changes:
  PackageAbiHepler no longer modifies Package
  Adds scan unit tests
 2019-11-20 15:43:57 +00:00
Chalard Jean
daf956f91e Merge "Rename waitForConnectivityBroadcast" 
am: eb6a236187

Change-Id: I10ecb001c2654de1636e639ac52c719f03e007a4
 2019-11-20 06:04:45 -08:00
Chalard Jean
eb6a236187 Merge "Rename waitForConnectivityBroadcast" 2019-11-20 13:50:01 +00:00
Aaron Huang
6763aec94c Expose IpConfiguration and ProxyInfo APIs 
Moving IpConfiguration methods to system API
for mainline support.

Public copy constructors of ProxyInfo and add
buildPacProxy(Uri, int) to create a new proxy
properties.

Bug: 139268426
Bug: 135998869
Test: atest android.net.cts
      atest android.net.wifi.cts
      atest FrameworksNetTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I07bcd2a34a222ea2b3cf0d8b497f051011c41c2c
 2019-11-20 20:07:05 +08:00