Commit Graph

17840 Commits

Author SHA1 Message Date
Hangyu Kuang
d964cdefc4 Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev am: 26a4940296
am: 40b96c785f

Change-Id: Ie5a72ad1f303e814129ed54915747c5aa925a437
2017-08-02 19:32:26 +00:00
Hangyu Kuang
40b96c785f Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev
am: 26a4940296

Change-Id: Ibfa5394a612dcec663b1d8b4a301f94b1f2fb49e
2017-08-02 19:22:36 +00:00
TreeHugger Robot
26a4940296 Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev 2017-08-02 19:14:23 +00:00
Todd Kennedy
0681d29966 Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev am: 5e049eb884
am: a1cb029caf

Change-Id: I9454b85835e0deb8264f7371748aad90cf04a42d
2017-08-02 14:43:36 +00:00
Todd Kennedy
a1cb029caf Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev
am: 5e049eb884

Change-Id: I27542404b197a9d11d611d95f271660856271d40
2017-08-02 14:33:09 +00:00
Todd Kennedy
5e049eb884 Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev 2017-08-02 14:23:16 +00:00
Previr Rangroo
b2016f1458 Merge "Add new Dolby Vision Profile types" into oc-mr1-dev am: 2ca4449d6b
am: 20efa0bce6

Change-Id: I3394825fb00c3409142c10c88fe44d2a622ece6f
2017-08-01 21:07:50 +00:00
Previr Rangroo
20efa0bce6 Merge "Add new Dolby Vision Profile types" into oc-mr1-dev
am: 2ca4449d6b

Change-Id: I164e07c43d0538835759e734cea871503431ceb9
2017-08-01 20:49:18 +00:00
TreeHugger Robot
2ca4449d6b Merge "Add new Dolby Vision Profile types" into oc-mr1-dev 2017-08-01 20:31:01 +00:00
Neil Fuller
bc66bdc72a Merge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev
am: 70ddf0932b

Change-Id: I5cf42b8926f4e0d22bff50d90a007b6c04530b8b
2017-08-01 10:12:17 +00:00
Neil Fuller
70ddf0932b Merge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev 2017-08-01 10:06:16 +00:00
Fyodor Kupolov
60d85d1028 Merge "Added setIdleConnectionTimeout method" into oc-mr1-dev am: 82f289a4b4
am: 7ca3d4ef1f

Change-Id: I53daa58574fc9961f35d4609265ffc646dd5aa50
2017-08-01 00:15:06 +00:00
Fyodor Kupolov
7ca3d4ef1f Merge "Added setIdleConnectionTimeout method" into oc-mr1-dev
am: 82f289a4b4

Change-Id: I31aaefcd59a0947532c84ccf07c828c4060c303e
2017-08-01 00:06:04 +00:00
Fyodor Kupolov
82f289a4b4 Merge "Added setIdleConnectionTimeout method" into oc-mr1-dev 2017-07-31 23:56:02 +00:00
Todd Kennedy
9da8b8a7fc Add new API to retrieve app names in a batch
Change-Id: I57e5c132bc58a32d70007a7a105775b526ff7bb9
Fixes: 62805090
Test: cts-tradefed run commandAndExit cts-dev -m CtsContentTestCases -t android.content.pm.cts.PackageManagerTest#testGetNamesForUids_null
Test: cts-tradefed run commandAndExit cts-dev -m CtsContentTestCases -t android.content.pm.cts.PackageManagerTest#testGetNamesForUids_empty
Test: cts-tradefed run commandAndExit cts-dev -m CtsContentTestCases -t android.content.pm.cts.PackageManagerTest#testGetNamesForUids_valid
2017-07-31 11:29:37 -07:00
Fyodor Kupolov
cf97b6b7f7 Added setIdleConnectionTimeout method
It allows apps to set time SQLite connection is allowed to be idle
before it is closed and removed from the pool.

Test: manual + DatabaseGeneralTest
Bug: 63398887
Change-Id: Ie09eeb4dc2b9e52ba67d9355b1f9bd869b148613
2017-07-31 11:05:57 -07:00
Neil Fuller
af4cfc5c81 Add a new constant to TimeZoneRulesDataContract
This enables time zone data app code (provided by Google)
to check the manifest (provided by the OEM) uses the right permission
without referencing internal manifest permission Strings directly.

Bug: 64139059
Test: Ran internal xTS tests
Change-Id: I4b1a8608beff3b5218ecf5162cfe8e31027e2007
(cherry picked from commit 8e2a85752b)
2017-07-31 18:20:05 +01:00
TreeHugger Robot
e3abb1fff1 Merge "Add a new constant to TimeZoneRulesDataContract" 2017-07-31 17:16:58 +00:00
Neil Fuller
8e2a85752b Add a new constant to TimeZoneRulesDataContract
This enables time zone data app code (provided by Google)
to check the manifest (provided by the OEM) uses the right permission
without referencing internal manifest permission Strings directly.

Bug: 64139059
Test: Ran internal xTS tests
Change-Id: I4b1a8608beff3b5218ecf5162cfe8e31027e2007
2017-07-31 16:01:54 +01:00
Jeff Sharkey
e2c0f95a43 Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev am: 2c131cafae
am: 284eab179c

Change-Id: Ib3f18cb1a0d92e54b4cfe3ab0e51d5364f64d547
2017-07-30 00:27:17 +00:00
Jeff Sharkey
284eab179c Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev
am: 2c131cafae

Change-Id: I1f1d834712004b520a02d3116de945c668236f81
2017-07-30 00:15:17 +00:00
Jeff Sharkey
b7479988d2 Migrate plans to @SystemApi, evolve permissions.
We're not yet ready to commit to SubscriptionPlan as public API, so
relax to be @SystemApi instead.  Add a new MANAGE_SUBSCRIPTION_PLANS
permission that we require apps to hold, unless they've been
delegated access via a trusted CarrierService.

Since several apps have the ability to provide plans for a single
subId, we now remember the "owner" who set the current plan
information, and we refuse to leak plan information beyond the app
that originally set it.

Relax permissions check to not require READ_PHONE_STATE, since we're
only returning data that an app provided to us earlier.  Also fix
NPE when SubscriptionInfo is missing.

Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug: 63997177, 63928277, 64156138, 63903381
Change-Id: If503378ef406dcaec438c9b41e837e0a821a3ef4
2017-07-28 16:59:14 -06:00
Hall Liu
1260acd215 Merge "Un-hide the MBMS streaming APIs" am: a50e17aea2 am: 8c4179e88c am: 7a83a8ac77 am: 76716535d9
am: 66299eb482

Change-Id: I490a8e1c83df38a292924d81fb6d0a5790f63365
2017-07-28 03:32:03 +00:00
Hall Liu
66299eb482 Merge "Un-hide the MBMS streaming APIs" am: a50e17aea2 am: 8c4179e88c am: 7a83a8ac77
am: 76716535d9

Change-Id: I8dd83d01a7511968ed51a80ad358a48e50c3d1e7
2017-07-28 03:11:49 +00:00
Hall Liu
76716535d9 Merge "Un-hide the MBMS streaming APIs" am: a50e17aea2 am: 8c4179e88c
am: 7a83a8ac77

Change-Id: Ia07b24d0b75d39144be8fb211ca6c2d84e24718a
2017-07-28 02:57:24 +00:00
Hall Liu
8c4179e88c Merge "Un-hide the MBMS streaming APIs"
am: a50e17aea2

Change-Id: Icd8ebf0e351914cdfb0f0c15343e2d2024706d6b
2017-07-28 02:40:20 +00:00
Shubang Lu
c281dbc673 Merge "Add permission check and @RequiresPermission annotation" 2017-07-28 01:39:57 +00:00
Hall Liu
2398921320 Un-hide the MBMS streaming APIs
Unhides the MBMS streaming APIs and modifies the vendor base classes to
no longer pass raw AIDLs to the vendor code.

Test: builds
Change-Id: I56030d646c2a1160277d85779c6ed431cda4efa7
2017-07-27 15:38:36 -07:00
Hangyu Kuang
0552036bc8 media: Add scaled video thumbnail extractor api.
Bug: 62198298
Test: CTS test
Change-Id: Ic78e2dac38b596a10d2fae76bc22f8c43fadf444
2017-07-27 13:31:46 -07:00
Tima Vaisburd
07fa454431 Merge "Merge "Unhide get/setTextClassifier in WebView" into oc-mr1-dev am: 2ebddfc398" into oc-mr1-dev-plus-aosp
am: 6a6275a802

Change-Id: I46dab838a4c5a0150f6773dee482f75c9ecf237f
2017-07-27 02:02:35 +00:00
Tima Vaisburd
2ebddfc398 Merge "Unhide get/setTextClassifier in WebView" into oc-mr1-dev 2017-07-27 00:45:21 +00:00
Fyodor Kupolov
737553c942 Merge "Tests for lookaside configuration" into oc-mr1-dev am: 56bd583162
am: 84a094d89b

Change-Id: Idab6dc0a8b725111c8aac4ca30b24938612db7f8
2017-07-26 21:44:48 +00:00
Fyodor Kupolov
56bd583162 Merge "Tests for lookaside configuration" into oc-mr1-dev 2017-07-26 20:50:47 +00:00
Tomasz Wasilczyk
5d03e3c2fe Merge "Rename ACCESS_FM_RADIO to ACCESS_BROADCAST_RADIO permission." into oc-mr1-dev am: 68a0dafc13
am: 07f350bb65

Change-Id: I5d45a3ecd5f3f88e5495e14e9c7f3f4afb70ed82
2017-07-25 17:35:48 +00:00
Tomasz Wasilczyk
68a0dafc13 Merge "Rename ACCESS_FM_RADIO to ACCESS_BROADCAST_RADIO permission." into oc-mr1-dev 2017-07-25 17:18:50 +00:00
Andrei Stingaceanu
5eaaea421e Merge "Remove @hide from ViewGroup debug methods" 2017-07-25 17:07:04 +00:00
Todd Kennedy
782ac9dd37 Merge "Add API for virtual preloads" into oc-mr1-dev am: be74124264
am: f35abca9a0

Change-Id: I5afa4315ece4c045aef50195f312eb706be64d91
2017-07-25 16:28:48 +00:00
TreeHugger Robot
be74124264 Merge "Add API for virtual preloads" into oc-mr1-dev 2017-07-25 16:13:08 +00:00
Todd Kennedy
78a72501af Add API for virtual preloads
Virtual preloads are applications that aren't actually on the
/system partition, but, act as if they were. One such distinction
is that these apps receive Intent.ACTION_BOOT_COMPLETED and start
out of the stopped state.

Change-Id: I812d3e7008b9d87e84aa33dbc4b3d8e8b334533c
Fix: 34855677
Test: Manual
Test: Install an app with "--preload"
Test: See that it receives Intent.ACTION_BOOT_COMPLETED
2017-07-25 06:48:39 -07:00
Andrei Stingaceanu
1244815e8f Remove @hide from ViewGroup debug methods
Allow developers to easily add their own debugging info
when developing custom ViewGroups.

Bug: 30117235
Test: tests still pass
Change-Id: Ia83005b4dc727c7b959a50e7b0130582f6e89762
2017-07-25 10:00:21 +00:00
Fyodor Kupolov
b773312982 Tests for lookaside configuration
Test: android.database.sqlite.cts.SQLiteDatabaseTest
Test: android.database.sqlite.cts.SQLiteOpenHelperTest
Bug: 63998707
Change-Id: I2e84a6e98baf889001ef7537a290f7e2aa2d709a
2017-07-24 23:33:00 +00:00
Shubang
dd3ec0be11 Add permission check and @RequiresPermission annotation
Bug: 62347045
Test: make; flash; run
Change-Id: Icbd828fa5a4762cf335492a42d321e29c4e2ec5f
2017-07-24 14:39:33 -07:00
Andrii Kulian
bfa0ed5110 Merge "DO NOT MERGE Add permission to launch activities on VD" into oc-mr1-dev 2017-07-24 18:42:25 +00:00
Romain Guy
49345e6cb5 Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev am: 572cb5242d
am: 99a05a108d

Change-Id: Iafc5ad4561d432257c286932c5c8ce74910bbef0
2017-07-22 03:14:31 +00:00
TreeHugger Robot
572cb5242d Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev 2017-07-22 03:01:02 +00:00
Romain Guy
0bbf0b41cc Expose shared buffer mode/auto refresh on Surface
These features can be set on a surface to reduce perceived latency
at the expense of visible tearing.

Bug: 63858546
Test: Manual, CTS test coming

Change-Id: Ica3f480bd1cb8f77dff57218d2fa8783433d3396
2017-07-21 16:11:17 -07:00
Tomasz Wasilczyk
df77643cd8 Rename ACCESS_FM_RADIO to ACCESS_BROADCAST_RADIO permission.
This is a backwards incompatible change against System API,
but as there are no existing radio apps, nobody uses it.

Bug: b/63405337
Test: manual
Change-Id: Iaf6085914434be01e1c1e363609e5b0087ffe127
2017-07-21 14:22:05 -07:00
Android Build Merger (Role)
e7828c5751 Merge "Merge "Unhide invalidateColors API" into oc-mr1-dev am: a8d14a6ea0 am: 6ccce0c175" 2017-07-21 18:34:16 +00:00
Lucas Dupin
8c9a80e203 Merge "Unhide invalidateColors API" into oc-mr1-dev am: a8d14a6ea0
am: 6ccce0c175

Change-Id: Ie10774063dab4d36efa63a6f40445e3d752bac6c
2017-07-21 18:32:03 +00:00
Andrii Kulian
02689a7884 DO NOT MERGE Add permission to launch activities on VD
1. Added permission ACTIVITY_EMBEDDING which allows apps to launch
activities on virtual displays.
2. Allow owner of display to launch activities from same app without
permission check to owned display.
3. Added permission checks for launching on secondary displays to
more target task/stack resolution paths in ActivityStarter.

Bug: 63117330
Test: android.server.cts.ActivityManagerDisplayTests
Test: go/wm-smoke
Change-Id: If169a77fb56241e06f7de20168dc38c4b0a217f5
(cherry picked from commit 7158764983)
2017-07-21 18:31:20 +00:00