Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
192,828 Commits 3 Branches 0 Tags
e37d2ba7ae62548cbb367b196378f8a57754e129
Commit Graph

10647 Commits

Author SHA1 Message Date
Svet Ganov
49b6b72a03 am f152ef2f: am 0bf290b9: am 981de3c5: Merge "Add permission meta-state flags to support grant/revoke permission policy." into mnc-dev 
* commit 'f152ef2fd5b0d3e1251e1b1866e5c57a73dc7b0b':
  Add permission meta-state flags to support grant/revoke permission policy.
 2015-05-12 00:43:38 +00:00
Svet Ganov
981de3c57c Merge "Add permission meta-state flags to support grant/revoke permission policy." into mnc-dev 2015-05-12 00:15:37 +00:00
Svet Ganov
8c7f700a59 Add permission meta-state flags to support grant/revoke permission policy. 
We now maintain a mata-state with each permission in the form of flags
specyfying the policy for this permission. This enables support of the
following use cases:

1. The user denies a permission with prejudice in which case an app cannot
   request the permission at runtime. If an app requests such a permssion
   it gets a denial unless the user grants the permission from settings.

2. A legacy app with disabled app-ops being upgraded to support runtime
   permissions. The disabled app ops are converted to permission revocations.
   The app ops manager is a part of the activity manger which sits on top
   of the package manager, hence the latter cannot have a dependency on the
   former. To avoid this the package installer which is the global
   permission managment authority marks the permission as revoked on
   upgrade and the package manager revokes it on upgrade.

3. A device policy fixing a permission in a granted or revoked state. This
   additional information is folded in the meta-state flags and neither
   apps can request such permissions if revoked not the user can change
   the permission state in the UI.

Change-Id: I443e8a7bb94bfcb4ff6003d158e1408c26149811
 2015-05-11 17:13:57 -07:00
Dianne Hackborn
b570ded1ef am 48453bf3: am 485d0b06: am 9c8600e1: Merge "Implement device idle in power manager." into mnc-dev 
* commit '48453bf36dc03726ba82438531945b9b5d1771a1':
  Implement device idle in power manager.
 2015-05-11 22:51:36 +00:00
Dianne Hackborn
9c8600e1af Merge "Implement device idle in power manager." into mnc-dev 2015-05-11 22:22:36 +00:00
Dianne Hackborn
8d66b3fbf5 Implement device idle in power manager. 
When in device idle mode, we now prevent most apps
from being able to hold partial wake locks.  The
device idle controller now pushes its white list of
app uids into the power manager, so it can apply this
policy correctly to only apps that are not whitelisted.

The implementation adds a new "disabled" flag to a wake
lock which is set when we want to apply this policy.  When
set, we ensure that we tell battery stats that the wake lock
is not being held and ignore that wake lock when computing
the power state summary.

Also add new SDK APIs to schedule alarms that are allowed
to execute while in idle mode.

Finally add new dumpsys commands to the device idle controller
to completely disable and re-enable its operation, to use
for testing.

Change-Id: I1f16672c6ac06d03bb538f9854d5843db9aa6f27
 2015-05-11 15:16:47 -07:00
Miao Wang
3d18fadf9b am 27ab3e86: am 3f7ae095: am cb556e0d: Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev 
* commit '27ab3e86dc2244ba7d91ab437bf6ea3c15690dd9':
  [RenderScript] hide Allocation.copyToFieldPacker()
 2015-05-11 21:47:58 +00:00
Miao Wang
cb556e0d25 Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev 2015-05-11 21:13:47 +00:00
Adam Powell
2ddde23c50 am f003c792: am 44e89c49: am 5fccffd5: Merge "Bringing new Chooser UI closer to spec" into mnc-dev 
* commit 'f003c7925692a22e9a4c0ad539f941cea886eb30':
  Bringing new Chooser UI closer to spec
 2015-05-11 19:40:21 +00:00
Adam Powell
5fccffd573 Merge "Bringing new Chooser UI closer to spec" into mnc-dev 2015-05-11 19:17:29 +00:00
Adam Powell
7d7580019e Bringing new Chooser UI closer to spec 
Separate the chooser targets into rows by type. Remove some API that
was redundant with LabeledIntent, simplifying ChooserTarget.

Change-Id: I90de471825f05d85e6ffbe72a32fb597be824a30
 2015-05-11 12:16:19 -07:00
Miao Wang
3c61327fa9 [RenderScript] hide Allocation.copyToFieldPacker() 
bug: 21027883

Change-Id: I122392bc5206ff19ea52712576d7f363e5915231
 2015-05-11 11:51:09 -07:00
Chirag Shah
a03934ce95 am d0a15765: am 23c0fca3: am 3ce72722: Merge "Revert the AssistAction class." into mnc-dev 
* commit 'd0a15765eb81c5d065ddd83f16b6c2c0791677e1':
  Revert the AssistAction class.
 2015-05-11 18:21:00 +00:00
Jean-Michel Trivi
403d2388ee am c28ffff0: am b3e99b53: am 3b12261c: Merge "android.media.AudioRecord.Builder: no "capture preset"" into mnc-dev 
* commit 'c28ffff012adb6c61a3acb9810ff7ffc53991b49':
  android.media.AudioRecord.Builder: no "capture preset"
 2015-05-11 18:20:55 +00:00
Chirag Shah
3ce72722ca Merge "Revert the AssistAction class." into mnc-dev 2015-05-11 17:39:49 +00:00
Jean-Michel Trivi
3b12261c50 Merge "android.media.AudioRecord.Builder: no "capture preset"" into mnc-dev 2015-05-11 17:39:29 +00:00
Amith Yamasani
550b4e9a1f am ec2f3d50: am db8d9ea0: am a5b2684c: Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev 
* commit 'ec2f3d50124e51bd9915b4fc0cf28f82a10495a4':
  Rename *AppIdle to *AppInactive per api-council
 2015-05-11 16:46:03 +00:00
Paul McLean
92940e95e7 am 9feba6e7: am 7238cdc3: am 1c82b221: Merge "Changes as per API council review." into mnc-dev 
* commit '9feba6e7744d5235f81fc9e5be0e8f3d149ad599':
  Changes as per API council review.
 2015-05-11 16:12:41 +00:00
Amith Yamasani
a5b2684c25 Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev 2015-05-11 16:11:14 +00:00
Paul McLean
1c82b221d4 Merge "Changes as per API council review." into mnc-dev 2015-05-11 15:39:29 +00:00
Jean-Michel Trivi
fd3ac3da17 android.media.AudioRecord.Builder: no "capture preset" 
Implement feedback to keep using "audio sources" instead of migrating
  to "capture presets" in AudioRecord.Builder.

Bug 20887665

Change-Id: I4d7773102711c3a4f3f4050b3eb5600bfba889cd
 2015-05-09 00:13:07 +00:00
Wei Jia
e8e88f81fb am 10d66d96: am 60769445: am ea4eb326: Merge "MediaSync: address API review." into mnc-dev 
* commit '10d66d96a7b61deb3b0d2730413867991b22a784':
  MediaSync: address API review.
 2015-05-08 23:55:47 +00:00
Fyodor Kupolov
a39b5ff076 am 8bc22f52: am 85dbc345: am 4f434a04: Merge "Remove restrictions PIN functionality" into mnc-dev 
* commit '8bc22f521872d64af1c61c1d0845ae562cc5cb8f':
  Remove restrictions PIN functionality
 2015-05-08 23:42:34 +00:00
Alex Klyubin
853676dda7 am 5d53ae1b: am 1258ff62: am 58237563: Merge "Document when encrypted AndroidKeyStore keys are wiped." into mnc-dev 
* commit '5d53ae1bf92414f66e3327675d3d9abac2698cf2':
  Document when encrypted AndroidKeyStore keys are wiped.
 2015-05-08 23:42:29 +00:00
Ronghua Wu
eec8294a14 am b60966e2: am 7a8c38b1: am 69e927c3: Merge "media: merge CodecException\'s getErrorCode and getReason." into mnc-dev 
* commit 'b60966e2c5459ff5fd18edf578e9e371a0d134db':
  media: merge CodecException's getErrorCode and getReason.
 2015-05-08 23:24:47 +00:00
Wei Jia
ea4eb326cf Merge "MediaSync: address API review." into mnc-dev 2015-05-08 23:23:47 +00:00
Fyodor Kupolov
4f434a0470 Merge "Remove restrictions PIN functionality" into mnc-dev 2015-05-08 23:10:31 +00:00
Alex Klyubin
5823756335 Merge "Document when encrypted AndroidKeyStore keys are wiped." into mnc-dev 2015-05-08 23:09:16 +00:00
Alex Klyubin
5418393c58 Document when encrypted AndroidKeyStore keys are wiped. 
This also drops the boolean parameter from
KeyGeneratorSpec.Builder.setEncryptionRequired to match the already
launched KeyPairGeneratorSpec.Builder.setEncryptionRequired.

Bug: 18088752
Change-Id: I91a3e8c77958971b1bda8329319f1a0d8043b669
 2015-05-08 15:56:59 -07:00
Paul McLean
e3383cc453 Changes as per API council review. 
Bug: 20887665
Change-Id: I1da7a2c69d8cf20682c767294b1647beef33f90c
 2015-05-08 15:55:18 -07:00
Ronghua Wu
69e927c3cd Merge "media: merge CodecException's getErrorCode and getReason." into mnc-dev 2015-05-08 22:53:33 +00:00
John Spurlock
35686d9bff am 22b5f2ac: am a7b4cc0d: am d89a6b2a: Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev 
* commit '22b5f2ac11e769315fa47915217fe546e467cab5':
  Zen: Simplify notification policy api, add zenmode api.
 2015-05-08 22:53:29 +00:00
Ronghua Wu
c53ad69bcc media: merge CodecException's getErrorCode and getReason. 
And unhide getErrorCode.

Bug: 20950388
Change-Id: I19c5ddaadfcdd446777e341f73edb75ca184d32f
 2015-05-08 15:31:15 -07:00
Craig Lafayette
f9c256e7d7 am 211a6d93: am 98950e44: am ed1ef7d4: Merge "DeviceInitializerStatus API review changes" into mnc-dev 
* commit '211a6d93f027050239e9937cbc463877fce2e016':
  DeviceInitializerStatus API review changes
 2015-05-08 22:30:14 +00:00
John Spurlock
d89a6b2abc Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev 2015-05-08 22:28:51 +00:00
Wei Jia
2d61e2b97c MediaSync: address API review. 
Rename *Settings to *Params;
Remove size parameter from MediaSync.queueAudio();

Bug: 20887706
Change-Id: I4c572da92ada51458031a482b96b3f624224e608
 2015-05-08 15:23:28 -07:00
Craig Lafayette
ed1ef7d4eb Merge "DeviceInitializerStatus API review changes" into mnc-dev 2015-05-08 22:12:58 +00:00
Glenn Kasten
e12c0c310a am a97439cb: am 3b6f0e53: am d7b69c2e: Merge "Add feature for pro audio" into mnc-dev 
* commit 'a97439cb8802499a48265e6aa690b7c6c3642154':
  Add feature for pro audio
 2015-05-08 21:47:51 +00:00
Dianne Hackborn
cc1b7d06dc am a0f5356f: am 396345ca: am ed9af066: Merge "Fix issue #20655182: API Review: ViewAssistStructure" into mnc-dev 
* commit 'a0f5356fdc84f5bf05677ae773bf168dc5349b7c':
  Fix issue #20655182: API Review: ViewAssistStructure
 2015-05-08 21:14:38 +00:00
Glenn Kasten
d7b69c2eca Merge "Add feature for pro audio" into mnc-dev 2015-05-08 21:11:08 +00:00
Chirag Shah
34cab7ca61 Revert the AssistAction class. 
Bug 20654534

Change-Id: Ia85e7ebe2b8b168d0f9100e5006160ac969a296d
 2015-05-08 20:44:12 +00:00
Dianne Hackborn
ed9af066b2 Merge "Fix issue #20655182: API Review: ViewAssistStructure" into mnc-dev 2015-05-08 20:42:12 +00:00
Tyler Gunn
c4b0c279eb am 85b0e218: am 7850f4bd: am 6624015e: Merge "Un-@hiding some missed VT APIs." into mnc-dev 
* commit '85b0e2180f4a7e75f8f22099cbd294927f08fd4c':
  Un-@hiding some missed VT APIs.
 2015-05-08 20:27:46 +00:00
Craig Lafayette
09c601e763 am 7e0a8d46: am e4d44eb4: am 4ca9955d: Merge "DevicePolicyManager API review changes" into mnc-dev 
* commit '7e0a8d464350d00e2cd142fc36268ad74f7bafd7':
  DevicePolicyManager API review changes
 2015-05-08 20:27:40 +00:00
Amith Yamasani
e5f330456b Rename *AppIdle to *AppInactive per api-council 
Change to setAppInactive and isAppInactive in a few places.

Bug: 20823737
Change-Id: Ie57dbc0dd2842e771bb5fd9f69b8041aacaa005c
 2015-05-08 13:20:22 -07:00
Tyler Gunn
6624015e4f Merge "Un-@hiding some missed VT APIs." into mnc-dev 2015-05-08 19:57:39 +00:00
Craig Lafayette
4ca9955d39 Merge "DevicePolicyManager API review changes" into mnc-dev 2015-05-08 19:55:34 +00:00
Tyler Gunn
6b3714939f Un-@hiding some missed VT APIs. 
Bug: 20947116
Change-Id: Idda9b7c7debafbea8c42eaadb75c3375b2c8ddb2
 2015-05-08 11:35:55 -07:00
Adam Powell
248706bad4 am 1e15e957: am bc5ee42f: am 5b56159b: Merge "Add Build.VERSION.PREVIEW_SDK_INT" into mnc-dev 
* commit '1e15e957cc9dc1109b9c7c6ac3d6d8f64b73bf53':
  Add Build.VERSION.PREVIEW_SDK_INT
 2015-05-08 18:32:22 +00:00
Adam Powell
5b56159b8e Merge "Add Build.VERSION.PREVIEW_SDK_INT" into mnc-dev 2015-05-08 17:59:31 +00:00