375142 Commits

Author SHA1 Message Date
Chen Xu
6bd29ab2df Merge "refactor data/voice roaming states" 2018-10-12 18:02:17 +00:00
Treehugger Robot
2ac8c8a3e2 Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" 2018-10-12 17:35:14 +00:00
Nandana Dutt
52502ef1a1 Merge "Add DumpstateOptions java implementation" 2018-10-12 17:31:39 +00:00
Neil Fuller
18f9a2c24d Merge "Remove explicit dependencies on "core" libraries" 2018-10-12 09:49:03 +00:00
Chalard Jean
35d6512a5d Merge "NetworkMonitor: add log of CaptivePortal result" 2018-10-12 07:57:35 +00:00
Chalard Jean
afa7fdabaa Merge "[PT13] Simple cleanup of ProxyTracker." 2018-10-12 07:34:43 +00:00
Treehugger Robot
293ab4941b Merge "Fix incorrect javadoc link" 2018-10-12 04:26:49 +00:00
Chalard Jean
f24b6c77a6 Merge "[PT12] Factor some code into ProxyTracker." 2018-10-12 04:23:16 +00:00
Chalard Jean
4b48dca2e8 Merge "Add log for debugging ConnectivityManager" 2018-10-12 03:14:48 +00:00
Treehugger Robot
69251fca46 Merge "Add the metalava_enabled property" 2018-10-12 00:50:32 +00:00
Nan Zhang
6c288efb4d Fix incorrect javadoc link
Test: m -j docs with -lerror enabled for frameworks/base docs.
Bug: b/116163454
Change-Id: I02a164b676397dd2d9e8a52ae344c1033b1a4029
2018-10-11 16:44:28 -07:00
Sooraj Sasindran
98966bcbb6 Merge "Introduce AlternativeNetwork APIs" 2018-10-11 22:58:32 +00:00
chen xu
0281169e6d refactor data/voice roaming states
1. migrate set/get roamingType from ServiceState to
NetworkRegState.set/get roamingType
2. migrate set/get roamingStateFromRegstate from ServiceState
to NetworkRegState.regState
3. new System API for neworkRegistration.isRoaming().

Bug: 116127096
Test: ServiceStateTest, ServiceStateProviderTest

Change-Id: Ib89744089c98713819c8d313240d629ddb77d0bf
2018-10-11 15:10:32 -07:00
Jack He
097a89513e Remove BluetoothDevice.ACTION_DISAPPEARED
This intent was never sent by the Bluetooth stack

Fixes: 112115770
Test: make
Change-Id: Iaf71aeafa21f44ec9b59c1b766c936ab7dde39f1
2018-10-11 21:06:29 +00:00
Shuzhen Wang
e9f1e8c123 Merge "Camera: Trivial doc update" 2018-10-11 21:02:32 +00:00
Treehugger Robot
bb9f855faa Merge "getTelephonyProperty returns defaultVal" 2018-10-11 20:30:17 +00:00
Treehugger Robot
5674805cda Merge "Update PROPERTY_HIGH_DEF_AUDIO API docs." 2018-10-11 20:15:46 +00:00
Treehugger Robot
546073a5b6 Merge changes I7070326d,I8346e53c
* changes:
  Add OWNERS file to AndroidKeystoreSPI implementation
  KeyguardStateMonitor looses connection with keystore if keystore dies
2018-10-11 19:05:27 +00:00
Chen Xu
cb90628990 Merge "Create URI for individual user settings in SIMINFO" 2018-10-11 18:19:12 +00:00
Tyler Gunn
6b6ae55f72 Update PROPERTY_HIGH_DEF_AUDIO API docs.
Make it more clear that the intention of the property is to convey whether
a call is high definition on the UI or not, and NOT to report the actual
audio codec in use.

Test: Build
Bug: 78550833
Change-Id: Id002cd1c9cc1d5aea6f8d9ab4e3d99956b7c42b2
2018-10-11 10:42:10 -07:00
Sooraj Sasindran
32e446bf00 Introduce AlternativeNetwork APIs
Introduce AlternativeNetwork APIs

Bug: 113106744
Test: Verified using test app to make api calls
Change-Id: I134d1aef40f014378fd1364e0bfec6926fe2093e
Merged-In: I7f470cd6028a12cc66a660d58720f803271d38eb
2018-10-11 16:45:08 +00:00
Treehugger Robot
73e8858e4b Merge "Remove ResponseCache from apache-http" 2018-10-11 16:37:03 +00:00
Janis Danisevskis
569055dd60 Add OWNERS file to AndroidKeystoreSPI implementation
Change-Id: I7070326d680c6bff00839d847f8fadbbe2b16fa7
2018-10-11 09:19:58 -07:00
Shuzhen Wang
2b11fddb22 Camera: Trivial doc update
Change-Id: I63198c6d2cb348380e718974dd356d48137ae376
2018-10-11 09:17:34 -07:00
Nandana Dutt
b3f7168136 Add DumpstateOptions java implementation
DumpstateOptions will be used to pass options to Dumpstate service
for specifying arguments for taking bugreports.

Test: m
Test: adb bugreport

Change-Id: I4dc9511f0be2f86239ea9094a3c527b6ce0d1d41
2018-10-11 17:05:35 +01:00
Janis Danisevskis
01c3c2fbac KeyguardStateMonitor looses connection with keystore if keystore dies
When keystore dies it no longer gets information about the lock screen
visibility state. This state is vital to enforcing the "unlocked
device required" authorization of keymaster keys.

With this patch KeyguardStateMonitor tries to reestablish the connection
to keystore if communication fails.

Test: run atest android.keystore.cts.CipherTest#testKeyguardLockAndUnlock
      after killing keystore
Bug: 117552147

Change-Id: I8346e53c342bdba0f5960b1feba7c26db5cef33e
2018-10-11 09:00:49 -07:00
Neil Fuller
066ca17372 Remove explicit dependencies on "core" libraries
The dependencies are unnecessary since bouncycastle, okhttp
and conscrypt are included in the "standard libraries".

Test: build
Bug: 113148576
Change-Id: Ic8d15d911decbdd6391db8c1231b845353586a54
2018-10-11 16:57:18 +01:00
David Brazdil
3590eb09ef Merge changes Icd51c4c7,I836ecb94
* changes:
  Add entries to hidden api greylist
  Add method to hidden api greylist
2018-10-11 15:35:58 +00:00
Treehugger Robot
9135811848 Merge "Frameworks: Add VMRuntime.hasBootImageSpaces check" 2018-10-11 15:10:34 +00:00
Treehugger Robot
e908a1d318 Merge "Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests"" 2018-10-11 13:24:02 +00:00
Fabrício Ferracioli
be338ad5a0 Merge "Whitelist free short code batch for 2018 Q3" 2018-10-11 13:06:16 +00:00
Treehugger Robot
a3b3b6468e Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" 2018-10-11 12:50:17 +00:00
David Brazdil
a8d554380d Add entries to hidden api greylist
Bug: 115387204
Test: m appcompat
Change-Id: Icd51c4c7d446ea72211804fbb050f4fee742db17
2018-10-11 12:50:40 +01:00
David Brazdil
8a91d3f044 Add method to hidden api greylist
Bug: 114488777
Test: m appcompat
Change-Id: I836ecb947390f7fc6986f6848299375c7599fc97
2018-10-11 12:21:48 +01:00
Neil Fuller
ab81538d6b Merge "Remove unused import" 2018-10-11 08:06:48 +00:00
Tadashi G. Takaoka
18c909cc8f Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests"
This reverts commit dee5a4dc2a5a6829e5509fc0e94903e30dcc238f.

Reason for revert: CLs on upstream branch are on hold.

Change-Id: I253294d080efdfd1dbf377812f12880e03dff1f6
2018-10-11 07:51:35 +00:00
Luke Huang
335253df0f Merge "Refactor tetherGetStats by using stable aidl structure" 2018-10-11 05:58:22 +00:00
Treehugger Robot
cf1176073d Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" 2018-10-11 03:32:10 +00:00
Treehugger Robot
772b75c26d Merge "Make setAirplaneMode @SystemApi for SetupWizard." 2018-10-11 02:44:21 +00:00
Jack He
4618ce3a06 Remove BluetoothDevice.ACTION_DISAPPEARED
This intent was never sent by the Bluetooth stack

Bug: 112115770
Test: make
Change-Id: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f
Merged-In: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f
(cherry picked from commit dd1c592fcd11e2bee25db0077da0ef3f59071d5d)
2018-10-10 17:43:32 -07:00
Treehugger Robot
0d954557a1 Merge "Fix incorrect javadoc links" 2018-10-10 23:23:53 +00:00
Treehugger Robot
e75f2f504e Merge changes from topic "aapt2-manifest-elements"
* changes:
  Remove workarounds for b/79755007
  AAPT2: Add the rest of supported manifest elements
  AAPT2: Add supported manifest elements
2018-10-10 22:29:57 +00:00
Neil Fuller
4d9823f3eb Merge "Avoid hidden DataFormat.is24Hour field access" 2018-10-10 22:12:56 +00:00
Treehugger Robot
419fc89b52 Merge "Phone service state change atom." 2018-10-10 19:51:36 +00:00
Yangster
4ccebeadc7 Phone service state change atom.
Background: BatteryStatsService tracks the phone scanning time metric. In Q,
we are migrating the dumpsys-based collection to the new infra. This CL is to
instrument the new logging mechanism.

Test: statsd test
FIX: b/116748990

Change-Id: I3cf5e0026bfc6f594c5f7b524f14b3a43b702afb
2018-10-10 19:45:10 +00:00
Treehugger Robot
81f32238ea Merge "dex/TEST_MAPPING: referenced non-test modules" 2018-10-10 18:40:13 +00:00
Treehugger Robot
c41a5d6bc0 Merge "Mark getInstallerPackageName @Nullable" 2018-10-10 18:13:28 +00:00
Neil Fuller
4df6279128 Avoid hidden DataFormat.is24Hour field access
DateFormat.is24Hour is not part of the CorePlatformApi but
DateFormat.set24HourTimePref(Boolean) is. Switch over.

Bug: 113148576
Test: build
Change-Id: I27103890f94cfe3679f386ea33b0450b453a7625
2018-10-10 19:13:19 +01:00
Neil Fuller
031dfa6f33 Remove unused import
StructGroupReq is imported but not used.
The import can be removed.

Bug: 113148576
Test: build only
Change-Id: I6b2ec5eb3f6c6e298fcde8e47dfd0979f889ca1d
2018-10-10 17:17:56 +01:00
Treehugger Robot
8a79748b0c Merge "Remove usage of StringFactory" 2018-10-10 16:05:20 +00:00