Commit Graph

19199 Commits

Author SHA1 Message Date
Brad Ebinger
98e3150570 Merge changes from topic "ims_imsservice_apis"
* changes:
  Modify ImsService API to accomodate compat
  Make ImsService API @SystemApi
  Integrate new MMTel APIs into the framework
  Integrate ImsCallSessionListener API changes
2018-01-30 16:19:42 +00:00
Jorim Jaggi
05bf37612c Merge "Revert "Add "Unlocked device required" parameter to keys"" 2018-01-30 15:36:28 +00:00
Brian Young
3a28570b28 Revert "Add "Unlocked device required" parameter to keys"
This reverts commit 55fff3a89d.

Reason for revert: Build breakages on elfin, gce_x86_phone.

Bug: 67752510

Bug: 72679761
Change-Id: Ia495e9cb158b64fcf015e37b170554a7ed6810a7
2018-01-30 15:31:42 +00:00
TreeHugger Robot
0bdcee3b45 Merge "Add new secure stop methods" 2018-01-30 02:16:44 +00:00
TreeHugger Robot
d8a2054c8f Merge "Add "Unlocked device required" parameter to keys" 2018-01-29 23:16:02 +00:00
Jean-Michel Trivi
975f900f22 Merge "Add support for external volume handler of volume adjustements" 2018-01-29 21:58:51 +00:00
TreeHugger Robot
84783905c0 Merge "Adds generic intent Instant App resolution" 2018-01-29 18:43:46 +00:00
Pavel Grafov
a77e198ea8 Merge "Log additional events in security log." 2018-01-29 18:41:41 +00:00
Android Build Merger (Role)
79320fd35e Merge "Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c406 am: 626f665a65 am: 8142017f62" 2018-01-29 18:33:15 +00:00
Ruchi Kandoi
ffe2a9c4c8 Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c406 am: 626f665a65
am: 8142017f62

Change-Id: I7ef07b3aa3a59f510a7a5e897d134707c04f675b
2018-01-29 18:32:53 +00:00
TreeHugger Robot
bd2f2e991f Merge "Add slice subtype constants for sliders/progress." 2018-01-29 18:31:57 +00:00
Brian C. Young
55fff3a89d Add "Unlocked device required" parameter to keys
Add a keymaster parameter for keys that should be inaccessible when
the device screen is locked. "Locked" here is a state where the device
can be used or accessed without any further trust factor such as a
PIN, password, fingerprint, or trusted face or voice.

This parameter is added to the Java keystore interface for key
creation and import, as well as enums specified by and for the native
keystore process.

Test: go/asym-write-test-plan

Bug: 67752510

Change-Id: I8b88ff8fceeafe14e7613776c9cf5427752d9172
2018-01-29 10:16:02 -08:00
Jean-Michel Trivi
610aa9b416 Add support for external volume handler of volume adjustements
For devices that use the config_handleVolumeKeysInWindowManager
  configuration, add API to receive volume key-related events
  directly, without them being processed by the framework
  (already not received by apps).

Bug: b/63906162
Test: set config_handleVolumeKeysInWindowManager, use
    "adb shell dumpsys audio" to verify adjustVolume methods aren't
    logged

Change-Id: I432b14fa9980764d69077b9f1b23b8c95f30814d
2018-01-29 09:39:10 -08:00
Pavel Grafov
ce72ef0f57 Log additional events in security log.
These events are required for US NIAP MDFPP v3.1 compliance.

Bug: 70886042
Test: manual
Change-Id: I1752469cf4c7ff499eb4356fa1c94f3146d4c9b8
2018-01-29 16:32:49 +00:00
Patrick Baumann
3e8bd0f3b5 Adds generic intent Instant App resolution
Bug: 63117034
Change-Id: Ie3818e913e8e1077f60434a626bc606c0b5015ab
Test: Manual using test app at google_experimental/users/patb/InstantAppsInP
Test: atest android.appsecurity.cts.EphemeralTest passes after modification
2018-01-29 16:19:42 +00:00
TreeHugger Robot
81f7471a22 Merge "Remove return value in clearApplicationUserData" 2018-01-29 15:41:28 +00:00
Narayan Kamath
add7bec836 Merge "WorkSource: Mark methods required by GMS as @SystemApi." 2018-01-29 13:27:05 +00:00
TreeHugger Robot
206593e49c Merge "Add freeze period support in SystemUpdatePolicy" 2018-01-28 16:11:37 +00:00
Ruchi Kandoi
62c46eac8e Add android.Manifest.permission.NFC_TRANSACTION_EVENT
This permission would gate if an application is eligible to receive
notifications about nfc transactions taking place on the Secure
Elements.

Bug: 72556384
Test: Test dummy notifications on sample app.
Change-Id: I233f7185bbc3a5511f79ae012cc60a081968eb99
2018-01-27 01:48:31 +00:00
TreeHugger Robot
4a24b57f0e Merge "Tweak and rename new ease curve" 2018-01-27 01:29:43 +00:00
Ruchi Kandoi
6149b0fa49 Add UID and Service for Secure Element Application
Bug: 64994044
Test: Boot; Check Service loaded.
Change-Id: I2f48ff204acd29b1a9f6819910aba5f8f3762977
2018-01-27 00:45:49 +00:00
Steven Moreland
d4b40969d4 Merge changes from topic "hidl-system-api"
* changes:
  Add remaining missing HIDL SystemApi methods.
  HIDL: reportSyspropMethod -> enableInstrumentation
2018-01-26 23:09:15 +00:00
Rubin Xu
29b9a7d1f4 Add freeze period support in SystemUpdatePolicy
Freeze period is defined as a pair of calendar dates (recurring annually)
during which the system should block any incoming system updates, including
security patches. They are set on top of existing system udpate policy
types (automatic, windowed, postpone) such that outside the freeze
periods existing policy semantics will still apply. They are created to
allow admin to keep their device fleet from any destabilizing changes during
critical period of the year, for example during Christmas sales period.

Device Owner can set several freeze periods, although to prevent the device
from not receiving OTAs indefinitely, each single freeze period is
restricted to be at most 90 days, and adjacent freeze periods need to be at
least 60 days apart. To properly enforce these restrictions, any freeze
periods the device previously experienced is tracked by DevicePolicyManager
and are validated against any new policy. This is to deal with corner cases
such as the admin repeatedly set a short but overlapping freeze period on a
rolling basis, hence bypassing the 90-day freeze period restriction.

Test: runtest -c com.android.server.devicepolicy.SystemUpdatePolicyTest frameworks-services
Bug: 64813061
Change-Id: I2864192797dc194edd9c183b881da6cfe3fdba5e
2018-01-26 23:07:59 +00:00
Ruchi Kandoi
dcf4c6dc26 Add UID and Service for Secure Element Application
Bug: 64994044
Test: Boot; Check Service loaded.
Merged-In: I2f48ff204acd29b1a9f6819910aba5f8f3762977
Change-Id: I2f48ff204acd29b1a9f6819910aba5f8f3762977
(cherry picked from commit dfaf4bdd1e7e12caf9bb69c8facc38e879861baf)
2018-01-26 11:11:52 -08:00
Jeff Tinker
1bfb3d2160 Add new secure stop methods
Methods are needed to release a secure stop by ID and
return a list of secure stops.

Test: gts media tests

bug:67361434
bug:64001680
Change-Id: Id35fb082175a0b152e7a6032b147f1d3b221719b
2018-01-26 10:39:17 -08:00
Narayan Kamath
dfcdcc9a2b WorkSource: Mark methods required by GMS as @SystemApi.
Bug: 71710975
Bug: 62390666
Test: make checkapi
Change-Id: Iec0714394dda40835ab3f2f444ca696850df9cdf
2018-01-26 17:00:10 +00:00
TreeHugger Robot
a5014f298c Merge "Remove @removed trySetQuietModeEnabled" 2018-01-26 16:14:04 +00:00
Tony Mak
7699a19d2b Remove @removed trySetQuietModeEnabled
Context:
Updated the API according to API council feedback. Marked it as
@Removed and keep it for a while for Launcher. But now Launcher
prebuilt is updated, we are safe to remove it.

Test: Build

BUG: 71818127

Change-Id: I33fec12addf7031bfbcd86bce9e636c31d0ea4d3
2018-01-26 16:13:44 +00:00
Tobias Thierer
9f82b6bab5 Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API." 2018-01-26 13:05:06 +00:00
Alex Chau
1033e3861e Remove return value in clearApplicationUserData
Bug: 65280228
Test: cts-tradefed run singleCommand cts -m DevicePolicyManager --test com.android.cts.devicepolicy.MixedDeviceOwnerTest#testClearApplicationData_testPkg
Test: cts-tradefed run singleCommand cts -m DevicePolicyManager --test com.android.cts.devicepolicy.MixedDeviceOwnerTest#testClearApplicationData_deviceProvisioning
Test: cts-tradefed run singleCommand cts -m DevicePolicyManager --test com.android.cts.devicepolicy.MixedDeviceOwnerTest#testClearApplicationData_activeAdmina
Change-Id: I8808ba49492771321a3b7eb1773f1bda9c595bc6
2018-01-26 11:43:44 +00:00
Leon Scroggins
c4533b7085 Merge "Expose AnimatedImageDrawable" 2018-01-26 11:16:04 +00:00
TreeHugger Robot
9add1b8c1b Merge "Revert "Fix issue #72116995: Add permission guarding Service#startForeground"" 2018-01-26 04:05:31 +00:00
Xiangyu/Malcolm Chen
f86ed0160b Merge "Add Voice / Data network specific reg states." am: ffdbbc533c am: e5932b56bc
am: bf960e0fd8

Change-Id: I5b7198b261b70bfff233c904e4565f3000dc8c88
2018-01-26 03:44:10 +00:00
Florina Muntenescu
8ec69a628b Merge "Making QuoteSpan more flexible." 2018-01-26 03:19:11 +00:00
Doris Liu
606c6aba75 Tweak and rename new ease curve
BUG: 63634960
Test: visual inspection

Change-Id: I4eca6222ddbc7f386d4891a4c4f8c3239e5f942f
2018-01-25 18:47:37 -08:00
Steven Moreland
adcb896fd6 Add remaining missing HIDL SystemApi methods.
A couple methods of Java classes which became SystemApis
but were used are still @hide.

Bug: 72480743
Test: hidl_test_java
Change-Id: I0cb82384932ab1758fa7576b2125825c48a4a6c9
2018-01-26 02:03:13 +00:00
Ruchi Kandoi
05d7bebe23 Merge "Open Mobile API for frameworks/base" am: 183865f3e1 am: ab8328c047
am: 2729909ab6

Change-Id: Iee488feed404819e487f3ae87b3e71f531fe69a4
2018-01-26 01:43:05 +00:00
Brad Ebinger
35d89ea6ac Modify ImsService API to accomodate compat
Modifies the ImsService API to accomodate
the ImsService compat layer for older
vender implementations

Bug: 63987047
Test: Manual, Telephony unit tests
Change-Id: Ifb2870414e3d80ef114b3c5fa00c5c5e1aa80b05
2018-01-25 17:40:03 -08:00
Xiangyu/Malcolm Chen
ffdbbc533c Merge "Add Voice / Data network specific reg states." 2018-01-26 00:41:27 +00:00
Treehugger Robot
71a9e66d4a Merge "Deprecate android.util.Mutable*." 2018-01-26 00:28:52 +00:00
TreeHugger Robot
854211d15b Merge "Store WebView package signatures as Signatures instead of Strings" 2018-01-25 22:58:49 +00:00
TreeHugger Robot
5815664d4b Merge "Add AbstractThreadedSyncAdapter#onUnsyncableAccount API" 2018-01-25 22:47:54 +00:00
Matthew Fritze
9bc0572151 Merge "Add Setting Slices Contract file" 2018-01-25 22:25:54 +00:00
Brad Ebinger
f8c3cd8b35 Make ImsService API @SystemApi
Marks the ImsService API as @SystemAPI.

Bug: 63987047
Test: Build, Telephony unit tests
Change-Id: I10f8a09950be87cb166b718d1dcc2954fba872cb
2018-01-25 14:11:37 -08:00
Robert Shih
54573c5971 Merge "MediaExtractor: getSampleSize API" 2018-01-25 21:27:39 +00:00
TreeHugger Robot
4b7abff005 Merge "add getMetrics() apis for AudioTrack and AudioRecord" 2018-01-25 20:31:07 +00:00
Calin Juravle
172814085b Merge "Extend the ArtManager profiling API to cover boot image profiling" 2018-01-25 19:10:23 +00:00
Malcolm Chen
4c01328d90 Add Voice / Data network specific reg states.
In NetworkRegistrationState.java, add hidden inner classes that
stores information specific to voice network registration state
and data network registration state.

Bug: 64132030
Test: build
Change-Id: I746be2a50cfa138acc5b2b40e38ab875ceab6d8d
2018-01-25 10:57:43 -08:00
TreeHugger Robot
15050aaa99 Merge "Statsd broadcasts when it is alive" 2018-01-25 18:55:45 +00:00
Dianne Hackborn
c2cbc0727a Revert "Fix issue #72116995: Add permission guarding Service#startForeground"
This reverts commit 994b5ad737.

Waiting for Chrome prebuilt.

Test: NA
Bug: 72116995
Change-Id: Ifcfea94ddefda27267640283038c9d0f933ea1d8
2018-01-25 10:43:28 -08:00