Commit Graph

106338 Commits

Author SHA1 Message Date
Automerger Merge Worker
73b581f0dd Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings" am: db70de3656
Change-Id: I0a695d10ecca6134e851c0e482af7318de4fdb95
2019-12-11 17:10:03 +00:00
Jian Jin
db70de3656 Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings"
This reverts commit ba4b561c3e.

Reason for revert: Move to CarSettings

Change-Id: I91fd1fa7dee2400095a014c189a40706b853c471
2019-12-11 00:35:05 +00:00
Automerger Merge Worker
08135b313a Merge "Do not cache enabled tags in Java." am: e280c89075 am: 2dcd338a46
Change-Id: I631b07420837c5271e2162c98d6f2c5150a8528e
2019-12-10 22:56:23 +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
Automerger Merge Worker
5e1e8b2756 DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings am: ba4b561c3e
Change-Id: I853bb7f04816151b34e7adcd024d31d971561558
2019-12-10 22:34:47 +00:00
Treehugger Robot
e280c89075 Merge "Do not cache enabled tags in Java." 2019-12-10 22:26:16 +00:00
Automerger Merge Worker
19f573a89b Merge "Remove usage of IccCardConstants hidden APIs" am: b181ba61e2 am: b09b13cf38
Change-Id: I5a8974d8cd5d2af70996ec60eae924ddd435c840
2019-12-10 22:10:05 +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
Jayachandran Chinnakkannu
b181ba61e2 Merge "Remove usage of IccCardConstants hidden APIs" 2019-12-10 21:31:17 +00:00
Automerger Merge Worker
e08205b609 Merge "track and report packages with undecorated remoteviews" into qt-qpr1-dev am: 1eb5828022
Change-Id: I24e5eeecdac3a9d72d73fb5bca9cdc7ec202f94c
2019-12-10 18:59:17 +00:00
Charles Munger
ee6451246e Merge "Deprecate AlteredCharSequence" am: ea4916dac7
am: cb90a87d2e

Change-Id: I55863aae50a20c17b18e25bbfda318eb4efe09d3
2019-12-10 08:31:31 -08: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
3f3dd3b432 Merge "InterfaceConfiguration: Don't use @hide Sets class" am: 2bf6bf92c6
am: e7182d5ba5

Change-Id: I8d21b1465b3a1f5a8b54e2c4fbc8a8d6a7a6a475
2019-12-10 06:04:32 -08: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
746d69afa5 Merge "Extend LocalLog to enable UTC timestamps" am: 9436134056
am: c74594a2e3

Change-Id: I417bf9581e3fbce9921e7893c1e63e6dd9a7b30b
2019-12-10 01:50:39 -08: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
Benedict Wong
270dc6ab35 Merge "Add message template support for checkStringNotEmpty" am: 0d0bfc92e8
am: 1c28a1aa35

Change-Id: Ie62535304ba68db625aa075c28273b5aff84b228
2019-12-09 16:19:58 -08:00
Benedict Wong
0d0bfc92e8 Merge "Add message template support for checkStringNotEmpty" 2019-12-09 23:59:30 +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
Jian Jin
ba4b561c3e DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings
Bug: 144846684
Test: SettingsProviderTest
Change-Id: Iebc53c70ea401c6ba244ed43db7a1d73f3a894df
2019-12-09 14:07:26 -08:00
David Sehr
f74eb32c12 Merge "Allow tuning of heaptargetutilization" am: 0e3e2a73c6
am: e673072feb

Change-Id: Ia7114c1d9fbee42ce27372947702c580bfd3159c
2019-12-09 13:40:46 -08:00
David Sehr
0e3e2a73c6 Merge "Allow tuning of heaptargetutilization" 2019-12-09 21:24:47 +00:00
Chris Wren
bc487b5759 track and report packages with undecorated remoteviews
print query results with:
  adb shell dumpsys notification --remote-view-stats

test the pulled atom with:
  make statsd_testdrive
  ./out/host/linux-x86/bin/statsd_testdrive 10066

Bug: 144855217
Test: atest frameworks/base/services/tests/uiservicestests/src/com/android/server/notification
Change-Id: I6dcc9871f78298a8b213a051223c7316f8feefc5
Merged-In: I773378fc7cfb47a9f9c7495404ddafa63f39cfaf
2019-12-09 15:48:14 -05:00
Rahul Sabnis
b0ff23dde3 Merge "Resolve BluetoothA2dp hidden APIs to resolve dependencies" am: 67eae9d7ba
am: 5ae6e7adc1

Change-Id: Ibdf41e956337808e63130db9e6101efa0382a4f1
2019-12-09 11:44:02 -08:00
David Sehr
a494449297 Allow tuning of heaptargetutilization
Remove a pair of explicit sets of this value.  This allows ART to tune
this parameter to improve GC responsiveness and memory usage.  Tuning
this parameter is a key area of work for OEM-requested high-memory
device configurations.

Bug: 145823510
Test: boot and run with various configurations of the flag.
Change-Id: I19680ff5fa1ebf9dfd4a3f71533d03510f4da414
Merged-In: I19680ff5fa1ebf9dfd4a3f71533d03510f4da414
(cherry picked from commit b2910d3b6f)
2019-12-09 10:49:47 -08:00
Benedict Wong
5501fcae57 Add message template support for checkStringNotEmpty
This change adds the ability for the Preconditions#checkStringNotEmpty()
to take a message template instead of just an error message, allowing
for template reuse.

Test: FrameworksNetTests passing
Change-Id: I6df1c3bff77b227126c35f066ee9112e959d6b1c
2019-12-09 17:55:42 +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
Automerger Merge Worker
d6c8280a7d [DO NOT MERGE] Resolver/Chooser - Window inset fixes am: 95ede7fb53
Change-Id: I77a948f5599ee8c3453b758136ea13c62ad95e69
2019-12-09 13:54:13 +00:00
Matt Pietal
95ede7fb53 [DO NOT MERGE] Resolver/Chooser - Window inset fixes
Resolver supports numerous layouts, with optional ViewGroups. Need to
make sure the window inset is applied to the correct view. If there is
a List present, add a footer so that the list scrolls underneath the
navbar.

Test: atest ResolverActivityTest
Bug: 145670872
Change-Id: I94652c5e0068436878a307701b5785f02060b8d6
2019-12-09 07:43:10 -05: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
b39a419fa4 Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled" am: bd4031de4a
am: 2fb54515a2

Change-Id: Id6f1c11c447ff1896b5df81a7625a643ecebce46
2019-12-06 15:34:45 -08:00
Meng Wang
405e5f3c15 Merge "SubscriptionPlan: move out of telephony" am: c4090312df
am: 3172db5841

Change-Id: Id061cab31b2bf810a889abf0f31b39b322f346ae
2019-12-06 15:22:54 -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
088c61aaf4 Merge "SubscriptionPlan: move out of telephony" am: a11df59bb4
am: 968927d7ff

Change-Id: Ia2bf315c236678d34d773e210e95d6d82efa0d32
2019-12-06 13:52:01 -08: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
c186f60e8c Merge "TimeDetector improvements" am: 6e3020490d
am: c72f796176

Change-Id: I76a5726953cd6dc7998e298c9d41e86a3b4f7c00
2019-12-06 04:08:26 -08:00
Neil Fuller
6e3020490d Merge "TimeDetector improvements" 2019-12-06 11:53:14 +00:00
Aaron Huang
d9b442b050 Merge "Add TrafficStats methods to public APIs" am: 8aed6e69f0
am: 1abb8de060

Change-Id: Ib98dde2ae3b6cfee05e8d5536565ce72f6722e0b
2019-12-06 03:12:46 -08: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