Commit Graph

17863 Commits

Author SHA1 Message Date
Philip P. Moltmann
615fefc04a Merge changes from topic 'TransferInstallSession-oc-mr1-dev' into oc-mr1-dev am: fdaad13803
am: f288de8421

Change-Id: Ia429dfd3ee1f44094ba519d22300297326f3421e
2017-08-08 01:07:17 +00:00
Philip P. Moltmann
f288de8421 Merge changes from topic 'TransferInstallSession-oc-mr1-dev' into oc-mr1-dev
am: fdaad13803

Change-Id: I2eaaf989fb6e5f006edd974d56386731d778e604
2017-08-08 00:54:48 +00:00
Tomasz Wasilczyk
98ea4bfa1d Merge "Change VENDOR program types to range." into oc-mr1-dev am: ecacb9850c
am: 24d0f84bf1

Change-Id: Idc444801a6da7c19cfa947db07d84f24162a52c4
2017-08-08 00:49:24 +00:00
TreeHugger Robot
fdaad13803 Merge changes from topic 'TransferInstallSession-oc-mr1-dev' into oc-mr1-dev
* changes:
  Allow to read all params used to create session.
  Allow to transfer+seal a install session
2017-08-08 00:45:48 +00:00
Tomasz Wasilczyk
24d0f84bf1 Merge "Change VENDOR program types to range." into oc-mr1-dev
am: ecacb9850c

Change-Id: I702d77c693303f903d1daabd8746a4d5ea4cfb5f
2017-08-08 00:41:04 +00:00
Tomasz Wasilczyk
ecacb9850c Merge "Change VENDOR program types to range." into oc-mr1-dev 2017-08-08 00:35:09 +00:00
Felipe Leme
3bec59a777 Merge "Minor Autofill changes after API council review." into oc-mr1-dev am: be3e4a6285
am: a9adf37e1d

Change-Id: Ic266dfc62284b345f707a3dee36e0dcf4faca328
2017-08-08 00:01:28 +00:00
Felipe Leme
a9adf37e1d Merge "Minor Autofill changes after API council review." into oc-mr1-dev
am: be3e4a6285

Change-Id: Ia2c1c3cf1987ac0567a6d04e8f9c10d4f2b62539
2017-08-07 23:53:09 +00:00
TreeHugger Robot
be3e4a6285 Merge "Minor Autofill changes after API council review." into oc-mr1-dev 2017-08-07 23:35:56 +00:00
Philip P. Moltmann
5d74493f64 Allow to read all params used to create session.
So that they can be verified by the app calling commit().

This really only makes sense if the app calling commit is different from
the app that created the session.

Bug: 37281396
Test: cts-tradefed run cts-dev -m CtsContentTestCases --test=android.content.pm.cts.InstallSessionTransferTest
      Installed and uninstalled packages via the PackageInstaller app

Change-Id: I5c954ca59b7582555bea847f3ddbba0aeefba301
2017-08-07 10:50:58 -07:00
Philip P. Moltmann
94deaf7725 Allow to transfer+seal a install session
... so that one package can supply the data and another one can issue
the commit.

Also allow reading of sealed sessions.

Also lock more in PackageInstallerSession so that we can be sure the
session is not used by the old package anymore once transferred and that
all calls into the session work on consistent data.

Bug: 37281396
Test: cts-tradefed run cts-dev -m CtsContentTestCases --test=android.content.pm.cts.InstallSessionTransferTest
      Installed and uninstalled packages via the PackageInstaller app
      Installed and uninstalled packages via the Google Play Store

Change-Id: Id4b7a0071d703b7d18c9f5bf2bd15ebf67086d07
2017-08-07 10:50:57 -07:00
Tomasz Wasilczyk
d2b5cfbdaa Change VENDOR program types to range.
Bug: b/64331420
Test: instrumentation
Change-Id: If5c56f09e2b9e272a40f0ca074a590ca6ec3a703
2017-08-07 10:20:24 -07:00
Jeff Sharkey
1fb3a312e7 Merge "Fix broken javadocs." into oc-mr1-dev am: b79eb54d36
am: 1ad38fe278

Change-Id: I21266d20be036196dbeddb9c4366d641ab1b68a8
2017-08-06 17:00:09 +00:00
Jeff Sharkey
1ad38fe278 Merge "Fix broken javadocs." into oc-mr1-dev
am: b79eb54d36

Change-Id: I283e3914833b01969308afbd2fad1889e0497338
2017-08-06 16:45:10 +00:00
Jeff Sharkey
67f9d5070a Fix broken javadocs.
Bug: 64337634
Test: make -j32 doc-comment-check-docs
Change-Id: I20fdd3dcddef09111d35946c41c596c7689effa6
2017-08-06 07:37:08 -06:00
Tomasz Wasilczyk
3bf594f064 Merge "Merge "Pass vendor-specific info as map." into oc-mr1-dev am: b4dcdd5f45" into oc-mr1-dev-plus-aosp
am: 8814183722

Change-Id: I001980f504db005dd8a220bc9c8ba514e48645cc
2017-08-04 21:36:44 +00:00
Tomasz Wasilczyk
2e935d20c7 Merge "Pass vendor-specific info as map." into oc-mr1-dev
am: b4dcdd5f45

Change-Id: I90ba8b94f6730cab7ec2850046a87dd50e894652
2017-08-04 21:23:42 +00:00
TreeHugger Robot
680a74c056 Merge "Refactor TextView TextAppearance attributes reading" 2017-08-04 07:58:00 +00:00
Tomasz Wasilczyk
0f1776d08b Pass vendor-specific info as map.
This solves a problem of identifying, if a given application is talking
to a hardware that can handle format of these strings.

Bug: b/64229617
Test: VTS, instrumentation
Change-Id: I6f525be90105bfdc01a899feea2a3151719ec8d2
2017-08-03 18:21:22 -07:00
TreeHugger Robot
64695cab81 Merge "Introduce new public API for specifying exact weight." 2017-08-03 09:55:11 +00:00
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
Felipe Leme
c7cea5b79e Minor Autofill changes after API council review.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 64262815
Fixes: 64262816
Fixes: 64263294

Change-Id: I18fa6f24c13233a54a5dae9061c07bcdadfaf4a7
2017-08-02 10:30:29 -07: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
Clara Bayarri
d2781160f1 Refactor TextView TextAppearance attributes reading
Attributes that can appear in a TextAppearance are read in 3
different places inside TextView:
- Within the TextAppearance in the constructor
- Within the Style in the constructor
- Within setTextAppearance

This change simplifies the attribute reading code so it only
happens in one place. Note the way TextView reads these attributes
is first populating them from the TextAppearance and then allowing
them to be overriden by the style. The same is accomplished here.

For testing purposes and for API consistency, this change also adds
the missing APIs
- isAllCaps
- isElegantTextHeight

Bug: 64053645
Test: bit CtsWidgetTestCases:.TextViewTest
Change-Id: Iad6c1c6515992a51020c656edabea4e2927572f3
2017-08-01 17:12:01 +01: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
Seigo Nonaka
762dc8bdae Introduce new public API for specifying exact weight.
Adding Typeface.create(Tyepface, int weight, boolean italic).
This API is a most primitive API for specifying exact weight value
for drawing text.

Test: CtsGraphicsTestCases:android.graphics.cts.TypefaceTest
Bug: 63135308
Change-Id: I5766870f68026fd1b13815e794f5df243cd8c912
2017-08-01 02:04:18 +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