8100 Commits

Author SHA1 Message Date
Chirag Shah
7f92f06742 Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 2015-06-16 16:54:03 +00:00
Jeff Sharkey
2cc03e5606 Yet another user restriction.
Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
2015-06-15 21:50:47 -07:00
Ruben Brunk
9a2da54e3c Merge "Add metadata for pre-distortion dimensions." into mnc-dev 2015-06-16 01:12:58 +00:00
Ruben Brunk
224eb3a4f1 Add metadata for pre-distortion dimensions.
Bug: 20491394
Change-Id: I6b95a7fe2fd765571bcd2774aee486d18169a727
2015-06-15 18:09:33 -07:00
Chirag Shah
61f794a70f Allow 3P apps to provide structured data within AssistContent.
For providing structured metadata to the assistant, we've decided to
standardize on JSON-LD (met with Paige/Ulas/Fabian), and decided the
data to be specified via:

AssistContent.setStructuredData(String structuredDataJson)

This method can be documented for 3P developers as allowing developers
to provide metadata to the assistant with the JSON-LD standard.

This would be centered more about content displayed on the screen,
rather than actions based, so we added it to the AssistContent class

Updated doc: go/setStructuredData

Change-Id: I816f69fd6896df822e30d6c71d840bd01f47e544
2015-06-15 17:48:41 -07:00
Junda Liu
73d0432324 Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 2015-06-15 23:54:38 +00:00
Junda Liu
e478649373 Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
Bug: b/21499566
Change-Id: I9fa33f124e0f617782709597761be75a20797d4b
2015-06-15 16:12:02 -07:00
Junda Liu
297da6ffb9 Remove hide_carrier_network_settings from Settings.
No longer needs this as carrier config manager handles it now.

Bug: b/21347654
Change-Id: I26d34cde0d31ae53a6e5a25cd555ed2ff7600f38
2015-06-15 15:29:08 -07:00
Yorke Lee
a5f592582b Merge "Send broadcast when default dialer changes" into mnc-dev 2015-06-15 21:23:28 +00:00
Yorke Lee
107c4ce2ac Send broadcast when default dialer changes
Add hidden TelecomManager.setDefaultDialer for system apps
to set the default dialer and trigger the broadcast

Bug: 21846308
Change-Id: Ifdd30cd1323ab0157edf7fd966173b6c52df6ba0
2015-06-15 12:36:09 -07:00
Dianne Hackborn
1958e5e787 Fix issue #21813831: Need API for asking to be added to power whitelist
Add the API.  Clean up a few related things.

Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5
2015-06-15 11:53:59 -07:00
Alex Klyubin
3264599e12 Remove EcIesParameterSpec until it's needed.
This class was added in Android M to enable us to expose ECIES. ECIES
is not going to happen in Android M. I'm thus removing this unused
class until such time when it's needed.

Bug: 18088752
Change-Id: I16ab1bbd0b4334419c9a8f29d64661c150aa8d32
2015-06-15 09:55:36 -07:00
Chris Wren
965097321d remove setLatestEventInfo
Bug: 18510449
Change-Id: I2f950b92a9c13fc29bf5642d44fd2fcce79e65fd
2015-06-15 08:22:05 -04:00
Svetoslav
6d9778328a Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 2015-06-14 20:01:02 +00:00
Svet Ganov
715cf2ac0b Make AppOpsManager#permissionToOp API public
We need this API to implement permission checker API
in the support lib that takes into account both app
ops and permissions.

bug:21277214

Change-Id: I684fc002bb71ec5e1cd2994098faa0d2036297ac
2015-06-14 00:50:38 +00:00
Dianne Hackborn
8a435ced67 Merge "Fix APIs." into mnc-dev 2015-06-12 16:34:38 +00:00
Rubin Xu
5c82d2cc17 Change references to APK Certificate to Signature
The fact that currently apk signature is certificates is just
implementation details.

Bug: 20820366

Change-Id: Icdd02cb51a550ea71ff83a84e2bdfcc21f8d43ed
2015-06-12 10:32:24 +01:00
Svetoslav
bfa216ac26 Remove bookmarks provider and associated permissions - framework
Change-Id: I7f5a2f14a12da473f05a5075d98e762f8f8ed970
2015-06-11 18:59:25 -07:00
Svet Ganov
6f918b2f92 Merge "Add new storage permission group" into mnc-dev 2015-06-12 01:40:24 +00:00
Dianne Hackborn
ece0f4f519 Fix APIs.
Issue #21039494: API Review: android.os.PowerManager.isDeviceIdleMode()
Issue #21347000: API Review: android.content.IntentFilter
Issue #20654534: API Review: android.app.assist

Also allow use of ActivityManager.setWatchHeapLimit on any platform
build as long as the calling app is debuggable.

Change-Id: Ic597e596fa772fcdf2553b64f444b3d9269e8b92
2015-06-11 18:07:43 -07:00
Dianne Hackborn
2430f47be7 Merge "Add ArraySet to the SDK." into mnc-dev 2015-06-11 23:14:37 +00:00
Adam Lesinski
2e49bfa6f0 Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev 2015-06-11 22:02:37 +00:00
Adam Lesinski
c8e8729244 UsageStats: Change INTERACTION to SYSTEM_INTERACTION
SYSTEM_INTERACTION events are signals to the system for a package's
implicit actions (service bound, etc).

These should not affect the API visible stats like lastTimeUsed, etc.
USER_INTERACTION is for user initiated actions (notification interaction, etc).

Bug:21761781
Change-Id: I4585cf35fbb158612a3c737710108bec34e89183
2015-06-11 22:01:45 +00:00
Carlos Valdivia
6eb73a5778 Revert "Revert "Permissions: Fix account related permissions.""
This reverts commit dcddc476651deb72a27798de56eef584e5be5d32.

Change-Id: Ie2402167fc7cd3d5e57bf2fba704fdf00cfcb4fe
2015-06-11 14:10:04 -07:00
Dianne Hackborn
f16747db09 Add ArraySet to the SDK.
Also fix some documentation.

Change-Id: I46025c3b5450e7cd671135b99ff3b298e223651d
2015-06-11 13:53:13 -07:00
Carlos Valdivia
dcddc47665 Revert "Permissions: Fix account related permissions."
This reverts commit ffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814.

Change-Id: I4c62b1b5a5bd4e2a5fac76244a16730526ed67fc
2015-06-11 20:04:04 +00:00
Carlos Valdivia
ffb46022b3 Permissions: Fix account related permissions.
Requires updating the docs in AccountManaager as well as the logic in
AccountManagerService.

MANAGE_ACCOUNTS, USE_CREDENTIALS, and AUTHENTCATE_ACCOUNTS are going
away. Where AUTHENTCATE_ACCOUNTS was required we now do signature
matching.

GET_ACCOUNTS is kept but has been grouped under contacts.

Bug: 20136477
Change-Id: Iabbb76dce8d1efc607c1f107911d7ddab598a481
2015-06-11 11:07:47 -07:00
Craig Lafayette
09ad6bfe96 Remove FRP wipe support for device initializers
- Remove ManagedProvisioning NFC parameter key from
  DevicePolicyManager
- Remove wipeIfAllowed from PersistentDataBlockManager

Bug: 21558883
Change-Id: I59354b7bb1ef7e0b0346ff9a7d1654780231dff0
2015-06-11 14:00:56 -04:00
Craig Lafayette
77b2d49abb Merge "Remove device initializer status messages" into mnc-dev 2015-06-11 17:45:03 +00:00
Svet Ganov
ee7fb4d683 Add new storage permission group
bug:21730509

Change-Id: If098def755417a90f50328f83d5b419d9e73f120
2015-06-11 10:15:05 -07:00
Svet Ganov
5772b5c671 Propagete document meta-data to custom print UI.
Change-Id: I3f122224e1b311a222969253ae0336177989a414
2015-06-11 03:32:09 -07:00
Chris Banes
dbdaa9b41e Merge "API council review feedback for ActionMenuView" into mnc-dev 2015-06-11 08:05:42 +00:00
Lorenzo Colitti
662761224c Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED.
The API review comments in http://b/21343774 point out that the
suggested use case for onPreCheck (captive portal login apps) is
not a good use case as it requires that the app always be
running.

Also, unhide NET_CAPABILITY_VALIDATED, which is useful to apps
that want to detect captive portals and network connectivity
failures.

Bug: 21343774
Change-Id: Iad7c839bcc136b0fa9581dccc5fd97a28efed4ab
2015-06-11 15:30:13 +09:00
Jeff Brown
40dbedfb1a Fix MediaBrowser.getItem() API inconsistencies, again.
Bug: 21668207
Change-Id: I2439179e5e551b5628a1d2044f43a9df74d4240c
2015-06-10 22:15:54 -07:00
Jonathan Basseri
57b7ec0495 Merge "Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL" into mnc-dev 2015-06-11 04:14:45 +00:00
Jonathan Basseri
3360c26579 Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL
Disabling voice privacy sounds scary. Update this config variable name
to what it actually does, which is to hide some settings UI.

Bug: 21571894
Change-Id: Ib981b5e442b56d0167a19326fe34935b7a1cfbf1
2015-06-10 20:57:40 -07:00
Jeff Brown
f880553309 Merge "Fix MediaBrowser.getItem() API inconsistencies." into mnc-dev 2015-06-11 03:40:35 +00:00
Jeff Brown
b7eff8828f Fix MediaBrowser.getItem() API inconsistencies.
Bug: 21668207
Change-Id: Idc8d3a079f66cc7bc4fa1016f84cddb26fe7f0f8
2015-06-10 20:06:24 -07:00
Jeff Brown
3c9614a03a Merge "Expose Context.getSystemServiceName()." into mnc-dev 2015-06-11 02:37:29 +00:00
Jeff Brown
40f58d910a Expose Context.getSystemServiceName().
Expose this method so that subclasses can declare new types of services
that can be returned by getSystemService(Class<T>).

Bug: 21343770
Change-Id: I08bdfa61153d19298645dc495deb2d535e54f9f0
2015-06-10 17:47:52 -07:00
Jorim Jaggi
d5f82d88e1 Merge "Update fingerprint icon" into mnc-dev 2015-06-10 23:09:03 +00:00
Jorim Jaggi
f6633da2b5 Update fingerprint icon
Now, a flat, scalable, tintable vector icon is used instead of a
complex graphics. This makes it suitable for most use cases. Also
rename it to fingerprintAuthDrawable.

Bug: 21572289
Change-Id: I413acbbd8e5143ddcb3e2cfa9772949d5fbf02fc
2015-06-10 16:03:44 -07:00
Jason Monk
287b889f93 Add action for reaching ignore battery optimizations
Bug: 21375688
Change-Id: I1477192371aae2f3497fd49ad704de183ed836a3
2015-06-10 15:38:47 -04:00
Ben Kwa
c783a5e762 Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev 2015-06-10 18:30:31 +00:00
Ben Kwa
77797400ec Enable apps to exclude their own roots from the DocumentsUI roots list.
- Add DocumentsContract.EXTRA_EXCLUDE_SELF (boolean extra)
- Add code to DocumentsActivity to cache the providers of the calling
  app if EXTRA_EXCLUDE_SELF is set on incoming Intents.
- Add code to RootsCache to exclude roots from the calling app.
- Add code to allow only system apps to use EXTRA_PACKAGE_NAME.

Change-Id: Ia7cc2a1a297676c7b26f6e583042a4607d8c9a4e
2015-06-10 11:24:55 -07:00
Andrew Flynn
da9bbf7255 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-10 11:41:32 +00:00
Chris Banes
a41b78973d API council review feedback for ActionMenuView
Reverts "MenuItem, navigation and overflow icon tinting" CL,
and adds getter and setter for the overflow icon to ActionMenuView
and Toolbar.

BUG: 21571899

Change-Id: I591f43650356443fa3256e4d74e28b6ddd8c2b33
2015-06-10 11:39:01 +01:00
Martijn Coenen
706f23ddb9 Merge "Make peer LLCP version an int." into mnc-dev 2015-06-10 06:58:20 +00:00
Martijn Coenen
bdc34b8440 Make peer LLCP version an int.
And split major/minor.

Bug: 21343778
Change-Id: Ie9f0ecc9172849d3b088a0c1ce6d872b2f607919
2015-06-10 08:49:02 +02:00
Svetoslav
a1e60f1f45 Merge "Use who when requesting permissions" into mnc-dev 2015-06-10 01:29:21 +00:00