Commit Graph

19019 Commits

Author SHA1 Message Date
Jason Monk
f7be12dc75 Merge "Expose permission-related Slice APIs" 2018-01-23 23:41:58 +00:00
Jorim Jaggi
555c6fcd96 Merge "Add API to set divider color in code" 2018-01-23 23:16:40 +00:00
Sudheer Shanka
811c3765be Merge "Add DPM API to block apps from using metered data." 2018-01-23 23:02:40 +00:00
Jason Monk
d71d0fc508 Merge "Remove old slice APIs for color" 2018-01-23 23:01:54 +00:00
Jeff Sharkey
5dd54fdfb6 Merge "Expose existing SubscriptionPlan APIs." 2018-01-23 22:39:11 +00:00
TreeHugger Robot
ba685389af Merge "Keystore APIs for Import Wrapped Key, Strongbox, 3DES" 2018-01-23 22:28:30 +00:00
Android Build Merger (Role)
c1bfc90fba Merge "Merge "Combined flags of data service requests into one reason param" am: 7d441c9b27 am: 28f64b869c am: eeac3b9d62" 2018-01-23 22:09:40 +00:00
Jack Yu
2376cbe33f Merge "Combined flags of data service requests into one reason param" am: 7d441c9b27 am: 28f64b869c
am: eeac3b9d62

Change-Id: I6b33b760ff26e1aaf7fdf3929ca71c7c14d78b36
2018-01-23 22:09:11 +00:00
Julia Reynolds
0d1e3990c6 Merge "Remove settings intent" 2018-01-23 22:08:32 +00:00
Treehugger Robot
7d441c9b27 Merge "Combined flags of data service requests into one reason param" 2018-01-23 19:43:25 +00:00
Treehugger Robot
cdc0a084d1 Merge "Added new slot status related broadcast." 2018-01-23 18:00:00 +00:00
TreeHugger Robot
e74fa6c231 Merge "Add new MediaDrm methods" 2018-01-23 17:07:40 +00:00
TreeHugger Robot
d66cfdfc9a Merge "AudioFocusRequest: add ability to force ducking for a11y" 2018-01-23 16:46:10 +00:00
Jorim Jaggi
a0b78d562a Add API to set divider color in code
Change-Id: Ie7489095a598a760d23fe507e831e9327ac9a2e5
Fixes: 68776845
Test: android.systemui.cts
2018-01-23 17:41:34 +01:00
TreeHugger Robot
4953824b89 Merge "Fix registerSliceCallback to match api guidelines" 2018-01-23 16:38:16 +00:00
Amit Mahajan
6ba8bc8a47 Merge "Added new slot status related broadcast." 2018-01-23 16:28:16 +00:00
Leon Scroggins
d3f9248bd7 Merge "Unhide ImageDecoder" 2018-01-23 15:19:43 +00:00
Ricky Wai
cee2094d75 Merge "Add update network watchlist config ConfigUpdater intent action" 2018-01-23 14:27:29 +00:00
Ricky Wai
c61216d4a2 Merge "Add ConnectivityManager.getNetworkWatchlistConfigHash()" 2018-01-23 14:25:39 +00:00
Julia Reynolds
c128c86481 Remove settings intent
There's no dedicated screen for it to go to.
Test: make
Bug: 63927402

Change-Id: I9fc3352b74e526b5bd43ac48626c0d469fae4899
2018-01-23 09:04:29 -05:00
TreeHugger Robot
414b665f2d Merge "Make BulletSpan more flexible and update JavaDoc." 2018-01-23 13:57:29 +00:00
Jeff Sharkey
e14c843877 Expose existing SubscriptionPlan APIs.
They're ready for prime-time!

Test: builds, boots
Bug: 64133169
Change-Id: Ic6c25b9e53daaf33577c9be168ac9962c8a23eed
2018-01-23 05:51:53 -07:00
Florina Muntenescu
987189b936 Make BulletSpan more flexible and update JavaDoc.
Test: BulletSpanTest
Bug: 72217003
Change-Id: I0ba4d93bd5a7bac02410e0edbd4b20f254959d4e
2018-01-23 12:08:39 +00:00
Lorenzo Colitti
d5876bc438 Add getDefaultNetwork to the NetworkStats public API.
This allows an app using the public API to know whether the
traffic in a particular bucket was on the default network
(i.e., the network was selected by the system), or not (i.e.,
the network was selected by the app).

Bug: 35142602
Test: builds, boots
Test: added coverage to NetworkUsageStatsTest CTS test, still passes
Change-Id: I9f6669908fa119743b9c0aa0c31a03e5ebafa7db
Merged-In: I9f6669908fa119743b9c0aa0c31a03e5ebafa7db
2018-01-23 18:28:07 +09:00
Frank Salim
21d9c1d44a Keystore APIs for Import Wrapped Key, Strongbox, 3DES
Import Wrapped Key:
Applications can import keys in a wrapped, encrypted format. Wrapped keys are
unwrapped inside of a Keymaster device.

Strongbox:
Applications can import and generate keys in secure hardware.

3DES:
Add KeyProperties and KeymasterDefs
Add AndroidKeyStore3DESCipherSpi and provider registrations

Bug: 63931634
Test: Keystore CTS tests in progress

Change-Id: I80b6db865b517fa108f14aced7402336212c441b
2018-01-23 00:29:11 -08:00
Ricky Wai
44dcbde52a Add ConnectivityManager.getNetworkWatchlistConfigHash()
Apps can use this API to get network watchlist config hash for auditing.

Bug: 63908748
Test: Able to compile
Change-Id: I5ce9e6bb6dad88139c0a102da58be0dd7c284b7a
2018-01-23 06:32:36 +00:00
TreeHugger Robot
43137e8e8d Merge "Add a method for fetching the WebView classloader." 2018-01-23 04:31:28 +00:00
TreeHugger Robot
03e7ec201b Merge "Add SystemApi in SystemProperties for vendor apks" 2018-01-23 04:14:01 +00:00
Sudheer Shanka
04d61ae6c3 Add DPM API to block apps from using metered data.
Bug: 63700027
Test: cts-tradefed run singleCommand cts-dev -m CtsDevicePolicyManagerTestCases -t \
      com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSetMeteredDataDisabled
Test: cts-tradefed run singleCommand cts-dev -m CtsDevicePolicyManagerTestCases -t \
      com.android.cts.devicepolicy.MixedProfileOwnerTest#testSetMeteredDataDisabled
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest#testSetGetMeteredDataDisabled
Change-Id: I147399d316f375c68b415dc6ede837c53cd1aad0
2018-01-22 19:33:09 -08:00
Leon Scroggins III
e5de9aa4a9 Unhide ImageDecoder
ImageDecoder is a new way to decode Bitmaps (or Drawables) that
streamlines common use cases of BitmapFactory.

Bug: 63909536
Bug: 63908092
Test: I0f36ce34c968fd7fae4d8edebabea3a421859615
      Ib2877276da8464b5f3eef0bbb848de202c90e97e
      I8d1672180d8325ae1caf44f0bbf41036b94e6253
      I405ebc86f7b6b019e0f040f1d4afe2e9d4354e5d
      Iaeb7c27bafb351932f0fabe59461ef50b1e2424a

Change-Id: Iee236ac73e0bc37ef6903a8150c0d2c84e5cf906
2018-01-22 21:41:28 -05:00
Amit Mahajan
c0a2e5f05d Added new slot status related broadcast.
Test: none
Bug: 64131518
Merged-in: I0a5825a1d121dc22f042fd71598f58e064e9e2a2
Change-Id: I0a5825a1d121dc22f042fd71598f58e064e9e2a2
2018-01-22 18:31:01 -08:00
TreeHugger Robot
e36211c232 Merge "Add update packages permission" 2018-01-23 02:17:25 +00:00
yuemingw
f197536347 Merge "Add NetworkTypeBitmask into public ApnSetting." am: 278dd4ab90 am: 97104cb905
am: aa32802268

Change-Id: Iab92157d82b1aa399aa06e77abdcf22d71f9f3b9
2018-01-23 01:22:09 +00:00
Sundong Ahn
5e05a9ae1c Add SystemApi in SystemProperties for vendor apks
The Apis in SystemProperties are needed for building ims.apk with
LOCAL_SDK_VERSION := system_current. So @SystemApi is added to
SystemProperties class and methods which are used by vendor apks (i.e.
ims.apk)

Bug: 67726847
Test: 1. build & boot on taimen
2. LOCAL_SDK_VERSION:=system_current in ims.apk && build ims.apk &&
check error count and android_system_stubs_current_intermediates.

Change-Id: I178f8d9b0b1f6bb1455ceec919805c4cc549cb32
2018-01-23 10:02:58 +09:00
Shuzhen Wang
98da482eca Merge "camera: Add support for multiple camera capture requests" 2018-01-23 00:36:16 +00:00
Etan Cohen
9c0a08b774 Merge "[RTT] Public LCI and LCR API" 2018-01-23 00:31:50 +00:00
TreeHugger Robot
58d241ce54 Merge "camera: Add OIS data keys" 2018-01-22 23:22:30 +00:00
Jack Yu
2a4d0c8d50 Combined flags of data service requests into one reason param
Made the API flexible for future expansion. The two boolean flag
'reasonShutdown' and 'isHandover' are merged into the 'reason'
params.

Test: Manual
bug: 64132030
Change-Id: I29a0ca6a7c3b897910f3bb6076f44315adc91893
2018-01-22 15:04:33 -08:00
Treehugger Robot
278dd4ab90 Merge "Add NetworkTypeBitmask into public ApnSetting." 2018-01-22 22:53:38 +00:00
Chen Xu
2f6b2726e6 Merge "address carrier id api review feedback" 2018-01-22 22:44:02 +00:00
Oscar Shu
fb0d9a7a8c Merge "WifiManager: mark WPS related API calls deprecated" 2018-01-22 22:35:30 +00:00
Gustav Sennton
265afdb14e Add a method for fetching the WebView classloader.
The WebView Support Library needs a way to hook into the WebView APK,
this new method returns a classloader that can be used to load internal
WebView classes.
The idea is to have this classloader be provided by the WebView APK
itself, so that the classes accessed from the classloader can be
filtered to avoid apps accidentally adding dependencies on internal
details of the WebView APK.

Test: N/A - cannot add CTS tests until we drop a WebView APK containing
the implementation for this API.
Bug: 38220806
Change-Id: If744a740ff0b1728d2d4674e73697bc6a5e27dde
2018-01-22 22:13:57 +00:00
TreeHugger Robot
fb39fd90f0 Merge "Add the assisted dialing carrier config." 2018-01-22 21:56:25 +00:00
Jeff Tinker
3eb07f46a7 Add new MediaDrm methods
Methods for querying HDCP, security levels and
number of sessions

bug:64001680
bug:33657579

Test: cts: MediaDrmMockTest, ClearKeySystemTest
gts: GtsMediaTestCases

Change-Id: Ie616f96ab6b74410a3d7548a7f34b20cf0831d0c
2018-01-22 13:34:06 -08:00
fionaxu
ac1defabc8 address carrier id api review feedback
1. improve comments
2. change returned carrier name from String to CharSequence
3. change to AndroidCarrierId

Bug: 64131637
Bug: 71584605
Test: Manual
Change-Id: I412d53bb9d4955e1267300692e90ebfffd6818df
Merged-in: I412d53bb9d4955e1267300692e90ebfffd6818df
2018-01-22 21:05:55 +00:00
Chen Xu
94920fbf04 Merge "address carrier id api review feedback" 2018-01-22 20:52:16 +00:00
Shuzhen Wang
e322374217 Merge "camera2: Add support for logical camera" 2018-01-22 20:30:15 +00:00
Android Build Merger (Role)
0d7e3c63b5 Merge "Merge "Debug: Add attachJvmtiAgent with classloader" am: 940c0341f0 am: 878abd8e91 am: 03eb67c287" 2018-01-22 20:16:34 +00:00
Andreas Gampe
627da5b264 Merge "Debug: Add attachJvmtiAgent with classloader" am: 940c0341f0 am: 878abd8e91
am: 03eb67c287

Change-Id: Ib3b8b14907253b3438588fda8b5059f61b5594cf
2018-01-22 20:14:49 +00:00
TreeHugger Robot
c6f994207d Merge "Add pending system update info system APIs." 2018-01-22 20:12:43 +00:00