Commit Graph

438239 Commits

Author SHA1 Message Date
Treehugger Robot
c6f86d3403 Merge "Fix capitalized variable UserData" 2019-12-06 15:26:11 +00:00
Anton Hansson
6a8eaf415d Merge "Add an init service for setting sdk props" 2019-12-06 13:28:21 +00:00
Anton Hansson
2df0a1096a Merge "Add genrule for the current sdk proto" 2019-12-06 12:04:55 +00:00
Neil Fuller
6e3020490d Merge "TimeDetector improvements" 2019-12-06 11:53:14 +00:00
Anton Hansson
2613c2d9d4 Merge "Add derive_sdk binary for reading sdk protos" 2019-12-06 11:13:03 +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
7f81046bed Merge "Remove incorrect annotation - @TransportType" 2019-12-06 04:50:27 +00:00
lucaslin
597b5b2aa6 Remove incorrect annotation - @TransportType
This annotation is mis-adding by aosp/929879, and now it also
makes compilation failure for Telephony Mainline.

Bug: 145755373
Test: atest FrameworksNetTests
Change-Id: Ic22ce6bf17c4300b8cd52217976bfb215a123f68
2019-12-06 11:17:25 +08:00
Treehugger Robot
e07c943cfd Merge "Remove telephony hidden api usages from commands" 2019-12-06 03:03:23 +00:00
Hall Liu
e3b535b98c Remove telephony hidden api usages from commands
Remove usages of Telephony hidden APIs from Telecom's debugging commands

Fixes: 141576016
Test: manual
Change-Id: Ia1184f804b3b03104dd5c911b15c8c28190b2395
Merged-In: Ia1184f804b3b03104dd5c911b15c8c28190b2395
2019-12-05 18:21:06 -08:00
Treehugger Robot
f6ea5afa58 Merge "Make BluetoothUuid constants and some functions System Apis" 2019-12-06 01:23:39 +00:00
Treehugger Robot
1a0e1bae27 Merge "VibratorService: Fix Typo in AIDL Perform Effect" 2019-12-06 01:22:04 +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
Tyler Gunn
4efe689e4c Merge "Add Verstat fields to Telecom call/connection classes." 2019-12-05 23:58:45 +00:00
Meng Wang
037b717fe8 Merge "Move DataConnectionRealTimeInfo from telephony to core." 2019-12-05 23:43:06 +00:00
Treehugger Robot
e16beef1cd Merge "AudioService: communicate audio HAL process pids to native audioserver" 2019-12-05 23:27:30 +00:00
Meng Wang
ddf215dd58 Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" 2019-12-05 23:23:51 +00:00
Jack Yu
954dcc18d7 Merge "Add no-service configuration for GB and JP" 2019-12-05 22:24:33 +00:00
Songchun Fan
c8b066091e Merge "[incremental] parcelable for incfs file descriptors" 2019-12-05 22:02:49 +00:00
Sarah Chin
226499214c Merge changes from topics "ngran", "update_ngran"
* changes:
  Update NGRAN bands
  Updated AccessNetworkConstants and RadioAccessSpecifier
2019-12-05 21:37:37 +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
Eric Laurent
a270b7c0e5 AudioService: communicate audio HAL process pids to native audioserver
Retrieve audio HAL processes pids from service manager and send them
to AudioFlinger native service. This is needed to dump audio HAL process tombstones
and because audioserver process does not have the SELinux permission to
list services.

Bug: 141528385
Test: Force watchdog and verify tombstone creation
Change-Id: I3e35b8040779e041b8d8c2e72d1e650d6f8fe818
Merged-In: I3e35b8040779e041b8d8c2e72d1e650d6f8fe818
2019-12-05 12:51:41 -08: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
Treehugger Robot
d481f63525 Merge "Add owners for ZramWriteback" 2019-12-05 19:49:51 +00:00
Yan Yan
bba4e2721b Merge "Fix and suppress API lint warning" 2019-12-05 19:24:36 +00:00
Srinivas Paladugu
16854888c0 Add owners for ZramWriteback
Change-Id: Ie70efc8a5afc842c2ef2a1b8235c1a908bb8e470
2019-12-05 10:42:08 -08:00
Anton Hansson
ff172bbbc7 Add an init service for setting sdk props
Add a oneshot init service, to be triggered early in the boot.
This is unlikely to be the permanent solution, but allows us
to get off the ground by at least getting the prop set.

Bug: 137191822
Test: m com.android.sdkext
Test: boot && adb shell getprop | grep sdk_info
Change-Id: I253c56961289d1226f3a9a471e7b6ca047c52a4e
2019-12-05 18:27:53 +00:00
Anton Hansson
1911d7c1a2 Add genrule for the current sdk proto
This is intended to be added to all apexes exposing SDK apis. The
version can then be bumped by changing the value in a single place.
The current version is 0.

Also build this into the sdkext module.

Bug: 137191822
Test: m com.android.sdkext
Change-Id: Ic2cd92ad1d184c8a01f0bc3d4fc21deb588cb7e8
2019-12-05 16:28:32 +00:00
satayev
d7dd4ad00c Merge "Move UnsupportedAppUsageProcessor to tools/platform-compat" 2019-12-05 14:29:45 +00:00
Neil Fuller
63d5f12489 Merge "Add suggestManualTimeZoneSuggestion to the client" 2019-12-05 13:51:34 +00:00
Anna Trostanetski
b38db5afe0 Merge "Add descriptions to compat changes." 2019-12-05 12:22:27 +00:00
Neil Fuller
106f18a666 Add suggestManualTimeZoneSuggestion to the client
Add TimeZoneDetector.suggestManualTimeZone() to set the time zone
"manually" and switch the device policy manager code over to using
it.

Add RequiredPermission annotations to TimeZoneDetector while there.

Bug: 140712361
Test: treehugger only
Test: atest services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Change-Id: Id247fddfdd793732dd88294ee215eda37cd0be4c
2019-12-05 12:12:14 +00:00
Anton Hansson
a82f161d33 Add derive_sdk binary for reading sdk protos
Put the lowest seen number in a persist sysprop.

Bug: 137191822
Test: manual ran derive_sdk on device with fake protos installed
Change-Id: Ic73d615d9d60769d237aa5a72dae2dfe56463007
2019-12-05 11:05:17 +00:00
Zoey Chen
8e708ff380 Merge "[Telephony mainline] Add SystemApi and NonNull annotation" 2019-12-05 07:58:03 +00:00
Zoey Chen
ace1a65025 Merge "[Telephony mainline] Move #dataStateToString and #getNetworkTypeName to calling location" 2019-12-05 07:57:55 +00:00
Harpreet \"Eli\" Sangha
3b07c28432 VibratorService: Fix Typo in AIDL Perform Effect
Test: Trigger Haptics at Varying Intensity Settigns
Change-Id: Ia731c69025cf2092681ff7e250839148aabca9c6
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-12-05 14:03:12 +09:00
Treehugger Robot
1d379ac065 Merge "Expose netId to SystemApi" 2019-12-05 02:29:41 +00:00
Xiao Ma
488c2b03d7 Merge "Add DHCP Rapid Commit FILS support." 2019-12-05 02:13:02 +00:00
Meng Wang
fdf6fc2718 Move DataConnectionRealTimeInfo from telephony to core.
Bug: 145232482
Test: make
Change-Id: I11cce938c15c604d0a72dd5c11727afd63cfce31
2019-12-04 17:51:42 -08:00
Songchun Fan
000b5b5bf6 [incremental] parcelable for incfs file descriptors
This parcelable is used to pass incfs fds from vold to system_server.

Test: builds
Change-Id: I7f0af8798d12815fbae404afabf4a88229a705da
Merged-In: Ifc3a43633356951b239486d66ee80d120bc4ab76
2019-12-04 17:42:57 -08:00
Allen Su
d154c93041 Merge "Define EXTRA_AUDIO_CODEC_TYPE in Connection" 2019-12-05 01:32:21 +00:00
Hall Liu
c6ec27d2d4 Merge "Deprecate KEY_IGNORE_RTT_MODE_SETTING_BOOL" 2019-12-05 01:19:26 +00:00
Bookatz
0999959500 Fix capitalized variable UserData
The variable userData was inappropriately capitalized.

Test: compiles
Change-Id: I87913ce3b1de92bc09748321a95853fceec260f3
2019-12-05 00:56:42 +00:00
Rahul Sabnis
5f457c0586 Refactor BluetoothHeadset APIs used by Settings
Bug: 143244793
Test: Manual
Change-Id: I399a1e0f93cb01c44817604edfcaa8fe5061142f
2019-12-04 16:49:21 -08:00
Treehugger Robot
54eb3077e8 Merge "Reland Perfetto upload logging atoms DO NOT MERGE" 2019-12-05 00:34:18 +00:00
Peter Wang
415143daf5 Merge "[Telephony Mainline] Expose hidden APIs and consts" 2019-12-04 23:39:50 +00:00
Charles Munger
17d1d950ec Merge "Deprecate IntentService" 2019-12-04 22:17:28 +00:00
Hector Dearman
25af773ac6 Reland Perfetto upload logging atoms DO NOT MERGE
Initial state:
- I landed ag/9652310 (the original change) downstream
- I cherry-picked this change on upstream to aosp/1158971
- This cherry-pick had an incorrect Merged-In tag referring to ag/7911242
- This cl was present between mirror-aosp-master and master internally

Branch                      CL
aosp/master                 (aosp/1158971)
    \/
internal/mirror-aosp-master (aosp/1158971)
    \/
internal/[---]              Nothing since ag/7911242 was here
    ||                      already automerger skipped our change
    \/
internal/master             (ag/9652310)
    \/
[various children]          (ag/9652310)

See:
https://android-build.googleplex.com/builds/automerger/graph/project/googleplex-android/platform/frameworks/base

How this will fix the issue:
- The revert will go everywhere aosp/1158971 did
- The reland will go everywhere aosp/1158971 did plus to internal/master

This reverts commit 8ed72df3d8e21c06d8b1b848d6e58c15b251d25a.

Merged-In: Ia40303aa2a669c301fab912b0b0bdf5ec1259caf
Change-Id: I3c061fef4f103f0f83147d56ed8019dcb39a7711
2019-12-04 21:56:05 +00:00