Commit Graph

95918 Commits

Author SHA1 Message Date
Rahul Sabnis
10fd57e659 Merge "Resolve BluetoothDevice hidden API usages by Settings"
am: ce656f7754

Change-Id: I6c9af91fa6338246a872318038dad699c5c3fe04
2019-12-12 13:19:41 -08:00
Treehugger Robot
ce656f7754 Merge "Resolve BluetoothDevice hidden API usages by Settings" 2019-12-12 21:13:46 +00:00
David Su
37f8e04de9 Merge "Expose CloseGuard as a public API"
am: 4314616565

Change-Id: I57cbf48bdf2edfbca4ebb377307bb2356cce9398
2019-12-12 10:28:42 -08:00
David Su
4314616565 Merge "Expose CloseGuard as a public API" 2019-12-12 18:19:12 +00:00
Anna Trostanetski
c06f69d2b4 Merge "Pipe disabled compat changes to runtime through zygote."
am: f33c3a8c9d

Change-Id: I25e7c5f7375dfa1d6dc5568e7e32810a4e86e82d
2019-12-12 06:04:52 -08:00
Anna Trostanetski
f33c3a8c9d Merge "Pipe disabled compat changes to runtime through zygote." 2019-12-12 12:15:21 +00:00
Neil Fuller
1602545f28 Merge "Handle multiple phoneIds in time detection"
am: 51c61e8bdb

Change-Id: I6b792aba6ca4ca2f6b43256080e6dff230aca370
2019-12-12 04:08:06 -08:00
Chalard Jean
31f969ba66 Merge "Make getNetworkSpecifier() public API."
am: ad60ef88e0

Change-Id: I92d0b7cb179e1c0f5cb789c2c668254732fbf30a
2019-12-12 04:04:32 -08:00
Neil Fuller
51c61e8bdb Merge "Handle multiple phoneIds in time detection" 2019-12-12 11:33:13 +00:00
Treehugger Robot
ad60ef88e0 Merge "Make getNetworkSpecifier() public API." 2019-12-12 11:29:24 +00:00
Jeongik Cha
c48e579ad8 Merge "Declare ParceledListSlice as generic type"
am: ea1b85a5eb

Change-Id: I9480999780c2ad96e40355e124b597623f1686a6
2019-12-11 22:06:50 -08:00
Jeongik Cha
ea1b85a5eb Merge "Declare ParceledListSlice as generic type" 2019-12-12 06:00:34 +00:00
Chalard Jean
7412d7aa61 Make getNetworkSpecifier() public API.
The builder lets clients set it, and this may be useful for
unit tests of apps. It should be public.
The need arises from uses of this in WiFi and Telephony
network factories.

Test: build
Bug: 135998869
Change-Id: I57279cac139c28e8654d2066ba0c60edd1e6cd98
2019-12-12 13:10:55 +09:00
Rahul Sabnis
d32a94d224 Resolve BluetoothDevice hidden API usages by Settings
Bug: 143245666
Test: Manual
Change-Id: Id34eb275f604e61330aeb91401dc31aeca666b8f
2019-12-11 11:37:05 -08:00
atrost
e44e134776 Pipe disabled compat changes to runtime through zygote.
Test: Java in process API still work correctly - tested locally with test app + adb overrides.
Test: atest com.android.internal.os
Test: atest com.android.server.am
Bug: 145743810
Change-Id: I6645a7ec767400cd579207f0eed1e6e7136c8a6f
Merged-In: I6645a7ec767400cd579207f0eed1e6e7136c8a6f
2019-12-11 18:44:20 +00:00
Florian Mayer
2dcd338a46 Merge "Do not cache enabled tags in Java."
am: e280c89075

Change-Id: I44cdfc71ccae34ef0975d25881859409924e1363
2019-12-10 14:35:42 -08:00
Treehugger Robot
e280c89075 Merge "Do not cache enabled tags in Java." 2019-12-10 22:26:16 +00:00
Jayachandran Chinnakkannu
b09b13cf38 Merge "Remove usage of IccCardConstants hidden APIs"
am: b181ba61e2

Change-Id: Id24383c88deff304c7fbbc0a4b6f95019bf35283
2019-12-10 13:53:13 -08:00
David Su
0c472adb0d Expose CloseGuard as a public API
Wrap dalvik.system.CloseGuard and expose it as a
public API from android.util.

Bug: 145831809
Test: atest CloseGuardTest
Change-Id: Ia44c84a69a5fb693fb8bb1a075c18a60253cedfc
2019-12-10 13:46:24 -08:00
Jayachandran Chinnakkannu
b181ba61e2 Merge "Remove usage of IccCardConstants hidden APIs" 2019-12-10 21:31:17 +00:00
Neil Fuller
312da9b9fc Handle multiple phoneIds in time detection
Android has dual sim devices, which means multiple "phone" time
signals. NITZ is generally trusted and considered "good enough" in the
absence of better signals, but it is provided by carriers and it's not
unusual for the signals to be incorrect by minutes. We don't want the
device system clock just flicking to the latest signal received.

The changes to the SimpleTimeDetectorStrategy try to balance recency and
provide some consistency / determinism. See comments in the code for
details. The time zone detection works in a similar way, particularly
with respect to choosing the lowest phoneId in the event of a tie.

There will be a follow-up change to remove the word "Simple" from
SimpleTimeDetectorStrategy as it no longer applies.

Test: atest services/tests/servicestests/src/com/android/server/timedetector/SimpleTimeDetectorStrategyTest.java
Test: atest android.app.timedetector
Bug: 140712361
Change-Id: I228aff8709eabfcec910af22f7ab08fee32d566a
2019-12-10 19:15:38 +00:00
Charles Munger
cb90a87d2e Merge "Deprecate AlteredCharSequence"
am: ea4916dac7

Change-Id: I40fe5070fe6475db5eb7f692b78b96e20c30b3d7
2019-12-10 08:27:10 -08:00
Charles Munger
ea4916dac7 Merge "Deprecate AlteredCharSequence" 2019-12-10 16:20:40 +00:00
Roshan Pius
e7182d5ba5 Merge "InterfaceConfiguration: Don't use @hide Sets class"
am: 2bf6bf92c6

Change-Id: I7c2ec75299170bb0eb06e842b77f798eb060fed0
2019-12-10 05:58:53 -08:00
Treehugger Robot
2bf6bf92c6 Merge "InterfaceConfiguration: Don't use @hide Sets class" 2019-12-10 13:52:48 +00:00
Florian Mayer
dd025de034 Do not cache enabled tags in Java.
As we are elimating the Binder notifications for the sysprop update for
atrace, we no longer have a callback that can be used to read the new
value of the enabled tags.

@CritivalNative calls are very fast (25 ns) so the overhead of always
going to native code to read the tags is negligible.

Test: flash & boot
Test: adb shell su root atrace -t 10 ss
Test: adb shell su root atrace -t 10 wm

Bug: 137366208

This is a cherry-pick of 9fd210224a

Change-Id: I1a07fefd751ee28ca9a632a3d78a2925e8827b9c
Merged-In: I1a07fefd751ee28ca9a632a3d78a2925e8827b9c
2019-12-10 13:17:23 +00:00
Neil Fuller
c74594a2e3 Merge "Extend LocalLog to enable UTC timestamps"
am: 9436134056

Change-Id: I6fcdbaec178f3718b6a3c285f991d6d3c4ec5162
2019-12-10 01:46:13 -08:00
Neil Fuller
9436134056 Merge "Extend LocalLog to enable UTC timestamps" 2019-12-10 09:42:38 +00:00
Meng Wang
d4e90d2e09 Merge "Style fix." 2019-12-10 00:24:32 +00:00
Meng Wang
3c97f033c5 Style fix.
To avoid merge conflict with internal branch.

Test: make
Change-Id: I04636443ea70f0cbac784a910c3d57fa80bd6bcc
Merged-In: I1b750751148925b4a7bd94553318907654012fc1
2019-12-09 23:30:16 +00:00
Neil Fuller
a7453c69b2 Extend LocalLog to enable UTC timestamps
Extend LocalLog to enable UTC timestamps with elapsed realtime clock
info too.

Switch time-related usages over to using UTC timestamps. This will make
debugging a lot easier when the code doing the logging is responsible
for changing the system clock and default time zone.

Test: treehugger only
Bug: 140712361
Change-Id: Ic6b12f9032c0c3ebc48f12a970a7b4dd398e7fec
2019-12-09 17:02:44 +00:00
Roshan Pius
f4c912ec75 InterfaceConfiguration: Don't use @hide Sets class
InterfaceConfiguration class is going to be jar-jar'ed by wifi (in
internal master). Remove this @hide usage to avoid transitive @hide
dependency on wifi mainline module.

Bug: 145904524
Test: Compiles
Change-Id: I4dbe69a8597d75d19fb12b4f4940b26b64fda35e
2019-12-09 15:40:19 +00:00
Rahul Sabnis
625e1c3ef4 Resolve BluetoothA2dp hidden APIs to resolve dependencies
Bug: 143240341
Test: Manual
Change-Id: Ib55e0fb106fa7b91ef4d3559da12ea2c048f1ae5
2019-12-06 16:58:05 -08:00
Jayachandran C
316302c001 Remove usage of IccCardConstants hidden APIs
Expose the string IccCardConstants as system APIs
Use TelephonyManger.SIM_STATE_XXX for remaining

Bug: 145767148
Test: Build
Change-Id: I5711d783be8c8414b8f9d7baa80cb4224bd771aa
2019-12-06 16:06:12 -08:00
Zach Johnson
bd4031de4a Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled"
* changes:
  Collapse the implementations of BluetoothDevice.createBond
  Call parameterized version of IBluetooth.enable
  Implement isEnabled in terms of getState
2019-12-06 23:20:07 +00:00
Treehugger Robot
c4090312df Merge "SubscriptionPlan: move out of telephony" 2019-12-06 23:12:58 +00:00
Meng Wang
1ba2871a02 SubscriptionPlan: move out of telephony
Hidden APIs of SubscriptionPlan are used in system server, not
telephopny. So it makes more sense for SubscriptionPlan to be in
core instead of telephopny.

Bug: 145814152
Test: make
Change-Id: I3bfb0ec699f46b0cc34c3bc2e13bfb242bc295bf
2019-12-06 13:50:15 -08:00
Meng Wang
a11df59bb4 Merge "SubscriptionPlan: move out of telephony" 2019-12-06 21:37:52 +00:00
Meng Wang
36673a4b44 SubscriptionPlan: move out of telephony
Hidden APIs of SubscriptionPlan are used in system server, not
telephopny. So it makes more sense for SubscriptionPlan to be in
core instead of telephopny.

Bug: 145814152
Test: make
Change-Id: I4c7ae02f9f4f154c99263521e08265d6fb367272
2019-12-06 11:47:46 -08:00
Neil Fuller
6e3020490d Merge "TimeDetector improvements" 2019-12-06 11:53:14 +00:00
Aaron Huang
8aed6e69f0 Merge "Add TrafficStats methods to public APIs" 2019-12-06 10:59:11 +00:00
Aaron Huang
29667d2942 Add TrafficStats methods to public APIs
Add methods to public APIs for mainline support.

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

Change-Id: I21a9c0dbdc79b1f1041fc9e23c6a4e1e97ecde92
2019-12-06 16:19:40 +08:00
Treehugger Robot
f6ea5afa58 Merge "Make BluetoothUuid constants and some functions System Apis" 2019-12-06 01:23:39 +00:00
Meng Wang
392f3db6b0 Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" 2019-12-06 00:32:40 +00:00
Treehugger Robot
b3de542cf7 Merge "Refactor BluetoothHeadset APIs used by Settings" 2019-12-06 00:11:52 +00:00
Meng Wang
037b717fe8 Merge "Move DataConnectionRealTimeInfo from telephony to core." 2019-12-05 23:43:06 +00:00
Meng Wang
ddf215dd58 Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" 2019-12-05 23:23:51 +00:00
Songchun Fan
c8b066091e Merge "[incremental] parcelable for incfs file descriptors" 2019-12-05 22:02:49 +00:00
Meng Wang
62d2ff8b36 Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager
Because the constants are only used by TelephonyRegistryManager and
TelephonyRegistry.

Bug: 140908357
Test: make
Change-Id: I6933d1aa5b8dc35f136c8c4aed8572221ddfb755
2019-12-05 21:32:03 +00:00
Meng Wang
646dcbd0ed Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY
Replaced with SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX. Both are set
in Intent extras by SubscriptionManager#putPhoneIdAndSubIdExtra.

Bug: 140908357
Test: make
Change-Id: I54a65ef81acc68c34af6263e929634f15f05e494
2019-12-05 12:12:20 -08:00