Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,246 Commits 3 Branches 0 Tags
19457a41e92aa18b643aced596a7b40af6884dff
Commit Graph

11026 Commits

Author SHA1 Message Date
Junda Liu
4e85ac8130 am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 
* commit 'a11ffa64366e39899bcda7448e5b5ffe727bea48':
  Remove hide_carrier_network_settings from Settings.
 2015-06-16 23:23:16 +00:00
Junda Liu
a11ffa6436 Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 2015-06-16 23:11:32 +00:00
Chirag Shah
44143f4974 am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 
* commit '7f92f06742fe3b66b9e8049db62ea55e1b41adf5':
  Allow 3P apps to provide structured data within AssistContent.
 2015-06-16 17:03:44 +00:00
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
475e199f4f am 2cc03e56: Yet another user restriction. 
* commit '2cc03e5606ad7cd473283898400506d5ac2237ba':
  Yet another user restriction.
 2015-06-16 05:17:01 +00:00
Jeff Sharkey
2cc03e5606 Yet another user restriction. 
Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
 2015-06-15 21:50:47 -07:00
Ruben Brunk
47b9e85b53 am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev 
* commit '9a2da54e3c7b5f382d2654eeb5228b945edd8e39':
  Add metadata for pre-distortion dimensions.
 2015-06-16 01:23:01 +00: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
84077de8e5 am 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 
* commit '73d043232434f3ad37af26615919eac3117536b7':
  Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
 2015-06-16 00:01:13 +00: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
8b0bc126c4 am a5f59258: Merge "Send broadcast when default dialer changes" into mnc-dev 
* commit 'a5f592582b36130c75483a3631dccf8df8b1d011':
  Send broadcast when default dialer changes
 2015-06-15 21:32:57 +00: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
f3a80c769a am 285cb414: Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev 
* commit '285cb414eaab8543f6c857357849bfcf24b5974f':
  Fix issue #21813831: Need API for asking to be added to power whitelist
 2015-06-15 19:28:53 +00: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
102a0e6b9b am 1923da34: Merge "Remove EcIesParameterSpec until it\'s needed." into mnc-dev 
* commit '1923da348b28be583cfbb8d6347ece52fc0873ed':
  Remove EcIesParameterSpec until it's needed.
 2015-06-15 17:51:41 +00: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
Svetoslav
f13e9a7932 am 6d977832: Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 
* commit '6d9778328a3c3c9da525870fff606af8ac5e9529':
  Remove bookmarks provider and associated permissions - framework
 2015-06-14 20:11:57 +00:00
Svetoslav
6d9778328a Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 2015-06-14 20:01:02 +00:00
Svet Ganov
1311933408 am 715cf2ac: Make AppOpsManager#permissionToOp API public 
* commit '715cf2ac0bcd44720096cc91709b690b4828f0df':
  Make AppOpsManager#permissionToOp API public
 2015-06-14 01:25:43 +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
e4b954a111 am 8a435ced: Merge "Fix APIs." into mnc-dev 
* commit '8a435ced674562b827f91800317a89056e050b15':
  Fix APIs.
 2015-06-12 16:48:16 +00:00
Dianne Hackborn
8a435ced67 Merge "Fix APIs." into mnc-dev 2015-06-12 16:34:38 +00:00
Rubin Xu
1cd7136b52 am 5c82d2cc: Change references to APK Certificate to Signature 
* commit '5c82d2cc17df9774e677f6bab9cb52659fc2b56d':
  Change references to APK Certificate to Signature
 2015-06-12 10:05:00 +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
399f64dd44 am 6f918b2f: Merge "Add new storage permission group" into mnc-dev 
* commit '6f918b2f92ece0ba7904262fc1fd0b50cf746a6c':
  Add new storage permission group
 2015-06-12 01:48:29 +00: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
39a87c7332 am 2430f47b: Merge "Add ArraySet to the SDK." into mnc-dev 
* commit '2430f47be7b7de7456e16eb5098242c22a6317ee':
  Add ArraySet to the SDK.
 2015-06-11 23:22:41 +00:00
Dianne Hackborn
2430f47be7 Merge "Add ArraySet to the SDK." into mnc-dev 2015-06-11 23:14:37 +00:00
Adam Lesinski
5e3394fe1e am 2e49bfa6: Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev 
* commit '2e49bfa6f02a4ab831a43453231888aa6d9c4ce1':
  UsageStats: Change INTERACTION to SYSTEM_INTERACTION
 2015-06-11 22:22:57 +00:00
Carlos Valdivia
149b3efd29 am b3c134e1: Merge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev 
* commit 'b3c134e1614e02471811a43d12bedcfc5778667b':
  Revert "Revert "Permissions: Fix account related permissions.""
 2015-06-11 22:13:44 +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 dcddc47665.

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
c74a99fe5f am d0041e5f: Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev 
* commit 'd0041e5f474f4e795d6bc9e5eeaec4098949897c':
  Revert "Permissions: Fix account related permissions."
 2015-06-11 20:11:57 +00:00
Carlos Valdivia
dcddc47665 Revert "Permissions: Fix account related permissions." 
This reverts commit ffb46022b3.

Change-Id: I4c62b1b5a5bd4e2a5fac76244a16730526ed67fc
 2015-06-11 20:04:04 +00:00
Carlos Valdivia
1af6b07091 am ffb46022: Permissions: Fix account related permissions. 
* commit 'ffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814':
  Permissions: Fix account related permissions.
 2015-06-11 18:25:19 +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
3c796eaf66 am 77b2d49a: Merge "Remove device initializer status messages" into mnc-dev 
* commit '77b2d49abb38fafb91fb99ce603a92f189553cd7':
  Remove device initializer status messages
 2015-06-11 17:57:29 +00: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
1216ce6a72 am 5772b5c6: Propagete document meta-data to custom print UI. 
* commit '5772b5c671a13d9c4bbc1e3803667166f811cb33':
  Propagete document meta-data to custom print UI.
 2015-06-11 15:58:38 +00:00
Chris Banes
bf82d7c198 am dbdaa9b4: Merge "API council review feedback for ActionMenuView" into mnc-dev 
* commit 'dbdaa9b41e418437ec29f7ea2fa27b859b3bef14':
  API council review feedback for ActionMenuView
 2015-06-11 15:58:21 +00:00