Commit Graph

22230 Commits

Author SHA1 Message Date
Jeff Sharkey
8f70cac068 Merge changes from topics "trashz", "bucketz"
* changes:
  Public APIs for "trashing" media.
  Define secondary media item bucketing.
2019-01-05 02:33:26 +00:00
Sudheer Shanka
2cf41e4fbf Merge "Revert "Added app context to smart screen brightness."" 2019-01-05 00:22:14 +00:00
Jeff Sharkey
5cc407f702 Public APIs for "trashing" media.
The "delete" operation is immediate and permanent, and users may wish
to instead mark content as being "trashed", so they can recover
accidentally trashed items before they're permanently deleted.

The default trash timeout is 48 hours, which should be enough time
to recover items the user cares about.  Apps can also use a custom
timeout if desired.

This is implemented by recording an "expiration" time for trashed
items, and deleting expired items during the next idle maintenance
pass.  Also use this expiration time to clean up pending items that
haven't been published; by default apps have a day to publish
pending items.

Bug: 121227045
Test: atest MediaProviderTests
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: I2e371b308dc135ad5363709a6f5385e4456bcb96
2019-01-04 16:17:03 -07:00
Ruchi Kandoi
d98f84b0d9 Merge "Deprecate Android beam APIs and create a feature flag to gate them" am: 6a3d45c4b2 am: d0c8a165d8
am: a33da54c8d

Change-Id: I1eda6b7d5879045e6bd35821ee5368ef72855942
2019-01-04 14:18:15 -08:00
Ruchi Kandoi
a33da54c8d Merge "Deprecate Android beam APIs and create a feature flag to gate them" am: 6a3d45c4b2
am: d0c8a165d8

Change-Id: I886941a5011fdf204fe62c1162dd2ad69d466f62
2019-01-04 14:06:55 -08:00
Ruchi Kandoi
96fe50bc1b Deprecate Android beam APIs and create a feature flag to gate them
Test: Test application trying to invoke the API
Bug: 117519147
Change-Id: Icd3187e4f3e0f180cb42d36011f60895fb395002
2019-01-04 21:49:00 +00:00
Sudheer Shanka
b3f60657a3 Revert "Added app context to smart screen brightness."
This reverts commit 54478d9cab.

Reason for revert: Broke work profile apps (http://b/122107873)

Bug: 111425369
Bug: 122107873
Change-Id: I7e3bf97725d542eb92a04bc75662ca6680287ba2
2019-01-04 21:34:58 +00:00
Jeff Sharkey
7b148d7ae7 Define secondary media item bucketing.
The existing buckets work well for first-level clustering of related
media, but it's common for multiple media items within a directory
to form a conceptual unit.  To support this, we're creating a
second-level of bucketing which is formed using the first part of
the file name.

This supports common industry-standard patterns like:

    IMG1024.JPG
    IMG1024.CR2

While also opening the door to further flexibility in the future:

    IMG1024.JPG
    IMG1024.HDR.JPG
    IMG1024.BURST001.JPG
    IMG1024.BURST002.JPG
    IMG1024.BURST003.JPG
    IMG1024.DNG
    IMG1024.DEBUG.BIN

We're currently advocating that the default representation of one of
these secondary clusters is the shortest .JPG filename contained
inside, with length ties broken alphabetically.

Clean up database management so that upgraded schema always matches
pristine schema, with tests to verify.  Generate views using the
actual projection mappings used at runtime.

Bug: 115377970
Test: atest MediaProviderTests
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: Ic679055ab6c884d2048626f51670a5dd370281c0
2019-01-04 14:33:49 -07:00
Ruchi Kandoi
0e1c39bf55 Merge changes from topic "multi-se-support" am: 54502d68ea am: 9c0ec9be9f
am: 650ff88a4c

Change-Id: I562af1c9c1b0c254d8b23466caceb94ef767aa1f
2019-01-04 12:38:53 -08:00
Ruchi Kandoi
650ff88a4c Merge changes from topic "multi-se-support" am: 54502d68ea
am: 9c0ec9be9f

Change-Id: Ieca9b142094c8c568409290fdf690fad529ef604
2019-01-04 12:25:13 -08:00
Ruchi Kandoi
54502d68ea Merge changes from topic "multi-se-support"
* changes:
  Add a mechanism to register AIDs to specific off-host SE
  Add Off-Host Card Emulation Features
2019-01-04 19:56:41 +00:00
Etan Cohen
4fd1f35592 Merge "[AWARE] Make PeerHandle parcelable" 2019-01-04 18:29:46 +00:00
Philip P. Moltmann
72401d4f77 Merge "Rename RuntimePermissionPresenter to PermissionController" 2019-01-04 17:32:44 +00:00
Richard Uhler
9b86c73c45 Merge changes from topic "rollback_systemapi"
* changes:
  Add test for multi-package rollback.
  Fix bug where RollbackManagerService ignores package name.
  Add test for user data rollback.
  Move rollback manager implementation to RollbackManagerServiceImpl
  Don't expose RollbackManagerService's internal Handler.
  Make RollbackManager @SystemApi.
2019-01-04 09:02:21 +00:00
Hyundo Moon
7053844db7 Revert "Introduce ControllerCallbackLink"
This reverts commit e521669b5d.

Reason for revert: Another CL will be uploaded which makes the APIs public, not @SystemApi.

Bug: 122169124
Change-Id: Ie9ed1067596fe1724879e81d768ac8252eda7841
2019-01-04 14:27:45 +09:00
Hyundo Moon
fcaaba066a Revert "Introduce SessionCallbackLink"
This reverts commit 8eee83e594.

Reason for revert: Another CL will be uploaded which makes the APIs public, not @SystemApi.

Bug: 121239657
Change-Id: I0537ffd487ab6889213b8917615156caaec17eb5
2019-01-04 14:20:47 +09:00
Ruchi Kandoi
44bb579621 Add a mechanism to register AIDs to specific off-host SE
Test: manual
Bug: 117253962
Change-Id: Id34bf84dcff7789548eac19478010838bebd9758
2019-01-04 01:14:50 +00:00
Ruchi Kandoi
ebf267a2a4 Add Off-Host Card Emulation Features
Test: CTS test; manual
Bug: 117253962
Change-Id: I7c35b1bffbc57870bb8c67704811a2649854d94e
2019-01-03 23:00:59 +00:00
Philip P. Moltmann
bc054d8436 Rename RuntimePermissionPresenter to PermissionController
As this has already evolved from just presenting data. In the future any
permission related calls to the permission controller will be added here.

As the calls are protected by different permissions the binding will not
require a permission anymore, but each individual call checks the
permission.

Bug: 120221960
Test: Looked at settings UI showing data from this interface
Change-Id: I6b4a5c3b7ee17b145e11e2c1b6e11a8a232bffed
2019-01-03 11:39:43 -08:00
TreeHugger Robot
8319a7ee7f Merge "Plumb new functor in native/webview" 2019-01-03 19:15:24 +00:00
Bo Liu
d6668e7c0c Plumb new functor in native/webview
Add plumbing to native/webview for the new functor.
Add a void* data parameter to avoid having to use a thread safe
map for in both the plumbing and in webview.

Test: Compiles and webview runs
Bug: 120997728
Change-Id: I0f9f3acb05688a5afcf95974bc0b3b117f33a8e3
2019-01-03 19:15:18 +00:00
Adam He
dc0d7b0ccc Merge "Merge app-specific and generic user data for field classification." 2019-01-03 17:15:57 +00:00
Hai Shalom
a088295e7f Merge "[DPP] Add DPP key management capability API" 2019-01-03 17:05:44 +00:00
Hai Shalom
4dab74f563 Merge "[DPP] Added new DPP Initiator APIs and callbacks" 2019-01-03 17:05:28 +00:00
Jean-Michel Trivi
9958c94e4d Merge "Dynamic audio policies: multi-zone through uid/device affinity" 2019-01-03 16:16:50 +00:00
Wale Ogunwale
a7b3c1a7b2 Merge "Add support for singleTaskInstance displays" 2019-01-03 16:00:22 +00:00
TreeHugger Robot
0995402a41 Merge "Refactoring canSuspendPackage to support batch queries" 2019-01-03 02:12:57 +00:00
Wale Ogunwale
9e737db3c9 Add support for singleTaskInstance displays
singleTaskInstance displays will only contain on task. This is mostly
used by ActivityView for use cases like bubbles.

Bug: 121047677
Test: atest ActivityManagerMultiDisplayTests#testSingleTaskInstanceDisplay
Change-Id: I5166015d8ecfa2845b4ffaa6c16d21a30a56b8a8
2019-01-02 14:27:05 -08:00
Adam He
1cb6f80670 Merge app-specific and generic user data for field classification.
Bug: 118617202
Test: atest CtsAutoFillServiceTestCases
Test: atest android.autofillservice.cts.FieldsClassificationTest android.autofillservice.cts.UserDataTest

Change-Id: Ibb958e0ca790d798c7c62bce5f7dbc108041fe07
2019-01-02 13:22:18 -08:00
Jean-Michel Trivi
d6f65dea01 Dynamic audio policies: multi-zone through uid/device affinity
Augment dynamic audio policies with audio device affinity for
 apps (a.k.a multi-zone handling), to enable associating apps
 with a set of audio devices (which may form a "zone" in cars).

Bug: 111647296
Test: requires device with routing policy started by CarService
Change-Id: I2994ae80624556d9321f788a0575d9f732157228
2019-01-02 12:38:12 -08:00
Hyundo Moon
c61fc6897c Merge "Introduce SessionCallbackLink" 2019-01-02 11:03:50 +00:00
Richard Uhler
c739c8c3f9 Make RollbackManager @SystemApi.
Require callers hold a new MANAGE_ROLLBACKS permission to interact with
the RollbackManager.

Bug: 112431924
Test: atest RollbackTest, with new test for permissions added,
      and with selinux in permissive mode.
Test: atest CtsPermission2TestCases:PermissionPolicyTest
Change-Id: I73f4f3457d85be580670cd69c89066d2cc348186
2019-01-02 09:19:45 +00:00
Hyundo Moon
8eee83e594 Introduce SessionCallbackLink
In order to avoid direct AIDL usages in framework, this CL introduces a
new class SessionCallbackLink which can prevent usages of
ISessionCallback.

Also, this CL renames ControllerCallbackLink.asBinder() to
ControllerCallbackLink.getBinder().

Bug: 121239657
Test: make update-api -j / make -j
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest
Change-Id: Icbcc4b045b1f6933c63d0d87aedc23b28c03d2de
2019-01-02 15:40:16 +09:00
Richard Uhler
474dffd225 Merge "Add RollbackManagerService" 2018-12-31 18:43:21 +00:00
Richard Uhler
b29f145505 Add RollbackManagerService
This change adds RollbackManagerService as a new system service for
managing apk level rollbacks.

To work properly this requires additional selinux policy changes. Fails
gracefully in case of selinux denials, until we have a chance to sort
out the proper selinux policy.

Bug: 112431924
Bug: 116512606
Test: atest RollbackTest, with selinux enforcement off.
Test: atest CtsPermission2TestCases:PermissionPolicyTest
Change-Id: Id72aae9c4d8da9aaab3922ec9233ba335bc0198f
2018-12-31 12:38:07 +00:00
TreeHugger Robot
1ebc3f0d7e Merge "Introduce ControllerCallbackLink" 2018-12-31 07:43:55 +00:00
Hyundo Moon
e521669b5d Introduce ControllerCallbackLink
In order to avoid direct AIDL usages in framework, this CL introduces a
new class ControllerCallbackLink which can prevent usages of
ISessionControllerCallback.

Bug: 122169124
Test: make update-api -j / make -j
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest
Change-Id: I860ea56afc046dd91e065ef207d374c0aa490c8f
2018-12-31 15:05:15 +09:00
TreeHugger Robot
6118bf44cc Merge "Change the value of AudioManager#FLAG_FROM_KEY" 2018-12-31 03:50:26 +00:00
shilu
ccd86941b4 Propagate some SIP INVITE header fields on a MT call
These fields can be used for Spoof call detection in the Dialer

Bug: 115537553
Test: compile and test on device
Change-Id: Ib92043536e0fc43e40efc53189a28c4e58064ddc
2018-12-28 22:39:26 +00:00
Shuo Qian
d78fdd83b2 Merge "EmergencyNumber enhancement" am: b158b12cbb
am: 8af07a9e24

Change-Id: I17931c9ef06a9e192a6c7f7c28563045daf37e2d
2018-12-28 10:33:42 -08:00
Hai Shalom
1931846f2f [DPP] Add DPP key management capability API
Add DPP key management capability API.

Bug: 112197021
Test: atest SupplicantStaIfaceHalTest
Change-Id: If19536a3c105a99477588ed4b19cf92d98914dfd
2018-12-27 15:40:05 -08:00
Shuo Qian
47eb930d87 Merge "Add Emergency service categories in ImsCallProfile" am: cfc6518c48
am: 128f421992

Change-Id: Ifa177a7348108dc3bd19fc37826c684b60b38898
2018-12-27 14:32:21 -08:00
Shuo Qian
945180736b Merge "Make some SubscriptionManager APIs system APIs" am: 755f2a38ac
am: ca9ce0df60

Change-Id: Ifca1ad29ce283d083619c5d0f11cb02d246007d6
2018-12-27 14:27:32 -08:00
sqian
46c0c303fa EmergencyNumber enhancement
1) Add Database source for EmergencyNumber
2) add mergeEmergencyNumber for merging two emergency numbers
3) enable Listener.EmergencyNumber enhancement
4) no need to pass any parameter to PhoneNotifier
5) modify API documentation
6) deprecate PhoneNumberUtils.isEmergencyNumber
7) modify API documentation for security exception and backward
compatibility
9) introduce some utils in EmergencyNumber for merging number purposes
10) add mnc into EmergencyNumber

Bug: 112657134
Test: Treehugger
Change-Id: I0dcd01bdad7d9c37294cd8b87eda54b4ac9d0a0b
Merged-In: I0dcd01bdad7d9c37294cd8b87eda54b4ac9d0a0b
(cherry picked from commit 9f93a12e1f)
2018-12-27 22:16:25 +00:00
Shuo Qian
cfc6518c48 Merge "Add Emergency service categories in ImsCallProfile" 2018-12-27 22:03:45 +00:00
Shuo Qian
755f2a38ac Merge "Make some SubscriptionManager APIs system APIs" 2018-12-27 21:58:00 +00:00
Victor Hsieh
3969585ed4 Merge "Update api/current.txt for setuid deprecation" am: 4ec239d760 am: fa99781eb0
am: d115d0ec59

Change-Id: I955b5b5b30ba4f0cad72efe34c10c8991f082c79
2018-12-27 12:35:45 -08:00
Victor Hsieh
d115d0ec59 Merge "Update api/current.txt for setuid deprecation" am: 4ec239d760
am: fa99781eb0

Change-Id: Id33ba38665fc21a943ae8bd682e9917ffb329ce8
2018-12-27 12:22:28 -08:00
Treehugger Robot
4ec239d760 Merge "Update api/current.txt for setuid deprecation" 2018-12-27 19:44:28 +00:00
Hai Shalom
e1afc8d787 [DPP] Added new DPP Initiator APIs and callbacks
Added new DPP Initiator APIs and callbacks:
startDppAsConfiguratorInitiator
startDppAsEnrolleeInitiator
stopDppSession
The Initiator APIs are asynchronous and provide events and status codes
through callbacks.

Bug: 112197021
Test: atest DppManagerTest
Change-Id: Ib2226a5e6d94b1d6247f958513c858cf38686ce8
2018-12-27 10:33:10 -08:00