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

52051 Commits

Author SHA1 Message Date
Michael Wright
9618088175 am 22fa94a1: am 0598d730: am 6959865f: Merge "Remove SLEEP and POWER from wake key list." into mnc-dev 
* commit '22fa94a10b41f2895ef2184e576aebd9d436d6bb':
  Remove SLEEP and POWER from wake key list.
 2015-05-12 12:46:41 +00:00
Michael Wright
22fa94a10b am 0598d730: am 6959865f: Merge "Remove SLEEP and POWER from wake key list." into mnc-dev 
* commit '0598d7309555111dac00745a7df14ccb9100e537':
  Remove SLEEP and POWER from wake key list.
 2015-05-12 12:36:06 +00:00
Michael Wright
6959865fb0 Merge "Remove SLEEP and POWER from wake key list." into mnc-dev 2015-05-12 12:12:50 +00:00
Ricky Wai
92b2d3afad am e3cd0af3: am 662ec915: am 227d42db: Merge "Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon" into mnc-dev 
* commit 'e3cd0af378d700f55dc606ae7ecefc9667eb5c0c':
  Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon
 2015-05-12 10:10:58 +00:00
Ricky Wai
e3cd0af378 am 662ec915: am 227d42db: Merge "Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon" into mnc-dev 
* commit '662ec9150bb45a96ac779675694ec0f7c47e98c2':
  Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon
 2015-05-12 09:59:11 +00:00
Rubin Xu
c7a0d2ef1b am 0835c1f3: am f04d6120: am 9fc8bb63: Merge "Tweak SystemUpdatePolicy according to API review." into mnc-dev 
* commit '0835c1f3e32358f0a89729fc04333e83b8ede728':
  Tweak SystemUpdatePolicy according to API review.
 2015-05-12 09:59:07 +00:00
Clara Bayarri
ff2b6f042c am eea5fe16: am 8086e031: am c12e4e46: Merge "Fix Floating toolbar is not refreshed when dragging insertion handle" into mnc-dev 
* commit 'eea5fe16de77b645c2443758105930bbeee3001c':
  Fix Floating toolbar is not refreshed when dragging insertion handle
 2015-05-12 09:58:59 +00:00
Rubin Xu
0835c1f3e3 am f04d6120: am 9fc8bb63: Merge "Tweak SystemUpdatePolicy according to API review." into mnc-dev 
* commit 'f04d6120532592d1314e43e29c5aa5a1de6734ac':
  Tweak SystemUpdatePolicy according to API review.
 2015-05-12 09:50:11 +00:00
Clara Bayarri
eea5fe16de am 8086e031: am c12e4e46: Merge "Fix Floating toolbar is not refreshed when dragging insertion handle" into mnc-dev 
* commit '8086e03178978f6f455445f4cb31ffe09638c0ff':
  Fix Floating toolbar is not refreshed when dragging insertion handle
 2015-05-12 09:50:04 +00:00
Ricky Wai
227d42db5b Merge "Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon" into mnc-dev 2015-05-12 09:36:02 +00:00
Rubin Xu
9fc8bb63d8 Merge "Tweak SystemUpdatePolicy according to API review." into mnc-dev 2015-05-12 09:06:14 +00:00
Clara Bayarri
c12e4e468f Merge "Fix Floating toolbar is not refreshed when dragging insertion handle" into mnc-dev 2015-05-12 09:06:06 +00:00
Chris Craik
ae86f573f6 am 36d7ba09: am 25b1d6d6: am 2f957893: Merge "Fix ViewGroup caching defaults" into mnc-dev 
* commit '36d7ba094f80ab2fd1c08018101ce5dc3c665aeb':
  Fix ViewGroup caching defaults
 2015-05-12 01:55:29 +00:00
Chris Craik
36d7ba094f am 25b1d6d6: am 2f957893: Merge "Fix ViewGroup caching defaults" into mnc-dev 
* commit '25b1d6d6c0ac56bf9d39312198c4c9862daedba8':
  Fix ViewGroup caching defaults
 2015-05-12 01:37:47 +00:00
Fabrice Di Meglio
07755a4dab am f7c087ba: am 4d5f8fbf: am e2f43948: Merge "Add user selectable Default Browser feature - part 6" into mnc-dev 
* commit 'f7c087ba5726c2cd1e2c9bfe6b6b940c4530a3c5':
  Add user selectable Default Browser feature - part 6
 2015-05-12 01:25:54 +00:00
Chris Craik
2f957893a4 Merge "Fix ViewGroup caching defaults" into mnc-dev 2015-05-12 01:18:32 +00:00
Fabrice Di Meglio
f7c087ba57 am 4d5f8fbf: am e2f43948: Merge "Add user selectable Default Browser feature - part 6" into mnc-dev 
* commit '4d5f8fbf6e48bba209506f5291cfeebf7aff6177':
  Add user selectable Default Browser feature - part 6
 2015-05-12 01:14:26 +00:00
Fabrice Di Meglio
e2f43948d1 Merge "Add user selectable Default Browser feature - part 6" into mnc-dev 2015-05-12 00:52:58 +00:00
Fabrice Di Meglio
3453e081e0 Add user selectable Default Browser feature - part 6 
- if a default Browser is not defined and if a Browser App
is selected into the disambiguation dialog, then make it as
the default Browser
- clear default Browser saved data (package name) when
the default Browser App is removed

See bug #20144393

Change-Id: Ia8621d7a61ec2cb60deded9d70f75f1e1d88d123
 2015-05-11 17:46:23 -07:00
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
f152ef2fd5 am 0bf290b9: am 981de3c5: Merge "Add permission meta-state flags to support grant/revoke permission policy." into mnc-dev 
* commit '0bf290b9622f4cdbf372e7ec97d19fadfafc6bc0':
  Add permission meta-state flags to support grant/revoke permission policy.
 2015-05-12 00:33:57 +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
48453bf36d am 485d0b06: am 9c8600e1: Merge "Implement device idle in power manager." into mnc-dev 
* commit '485d0b06262129f76ee096a59ddc9374a04ff7ce':
  Implement device idle in power manager.
 2015-05-11 22:38:02 +00:00
Chris Craik
f6ce8fd4f3 Fix ViewGroup caching defaults 
bug:20718535

Revert to established defaults of these two properties.

Change-Id: I798cfa2e53b26eafd30b191ad6e3b721fe6bd249
 2015-05-11 15:33:12 -07: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
Doris Liu
6c892be4f3 am f39708c3: am 803a1e84: am a2f04382: Merge "Use ArrayMap instead of HashMap for storing relavant nodes" into mnc-dev 
* commit 'f39708c3e46006273411a0fb54a87fc23c697e77':
  Use ArrayMap instead of HashMap for storing relavant nodes
 2015-05-11 22:10:32 +00:00
Doris Liu
f39708c3e4 am 803a1e84: am a2f04382: Merge "Use ArrayMap instead of HashMap for storing relavant nodes" into mnc-dev 
* commit '803a1e8428731390689357750f87b408c2f20f8e':
  Use ArrayMap instead of HashMap for storing relavant nodes
 2015-05-11 21:55:33 +00:00
Doris Liu
a2f043822b Merge "Use ArrayMap instead of HashMap for storing relavant nodes" into mnc-dev 2015-05-11 21:31:42 +00:00
Doris Liu
d7444427d9 Use ArrayMap instead of HashMap for storing relavant nodes 
This fix is to take advantage of ArrayMap, which is a key-value
mapping data structure that is more memory efficient than HashMap.

Bug: 11604254
Change-Id: I57006880de570a4d7f3899e274cf0a06355d116b
 2015-05-11 13:23:31 -07: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
f003c79256 am 44e89c49: am 5fccffd5: Merge "Bringing new Chooser UI closer to spec" into mnc-dev 
* commit '44e89c496202ae4ee5bf5b7ebfd16c332f908c00':
  Bringing new Chooser UI closer to spec
 2015-05-11 19:29:57 +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
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
Chirag Shah
d0a15765eb am 23c0fca3: am 3ce72722: Merge "Revert the AssistAction class." into mnc-dev 
* commit '23c0fca337e522a45741c763c0da07013a0238bf':
  Revert the AssistAction class.
 2015-05-11 18:08:14 +00:00
George Mount
79fcf9e194 am 42240e1f: am 96f1d461: am 3dec0d47: Merge "Disable input during Activity Transition." into mnc-dev 
* commit '42240e1fe20d5e3dfd8a704eee8a200d98c0212f':
  Disable input during Activity Transition.
 2015-05-11 17:55:58 +00:00
Chirag Shah
3ce72722ca Merge "Revert the AssistAction class." into mnc-dev 2015-05-11 17:39:49 +00:00
George Mount
42240e1fe2 am 96f1d461: am 3dec0d47: Merge "Disable input during Activity Transition." into mnc-dev 
* commit '96f1d4612c50d0944dc10a313992de8160f9fc13':
  Disable input during Activity Transition.
 2015-05-11 17:36:15 +00:00
Rubin Xu
d86d58cd01 Tweak SystemUpdatePolicy according to API review. 
Make SystemUpdatePolicy Parcelable; hide public constructor and
expose static builder methods.

Bug: 20820025
Change-Id: I594ba3c7e5514551134ba6c866b24498b66506bf
 2015-05-11 18:35:32 +01:00
George Mount
3dec0d4721 Merge "Disable input during Activity Transition." into mnc-dev 2015-05-11 17:19:03 +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
Amith Yamasani
ec2f3d5012 am db8d9ea0: am a5b2684c: Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev 
* commit 'db8d9ea0d4d3d99a2f29e55c7a55ca7bff42e568':
  Rename *AppIdle to *AppInactive per api-council
 2015-05-11 16:33:08 +00:00
John Spurlock
8f080d0724 am 31f6e2dc: am e1e7b05b: am 4cf2ae9c: Merge "Add new metrics categories for the two notification access screens." into mnc-dev 
* commit '31f6e2dcb2ea28aa8174967021a58ca400b0d82a':
  Add new metrics categories for the two notification access screens.
 2015-05-11 16:12:46 +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
Abodunrinwa Toki
1720865b3a am a98c2791: am 33808e8b: am f864d925: Merge "Set FloatingToolbar width for portrait and landscape." into mnc-dev 
* commit 'a98c27913e4e4d4e187b46e6e59f183c1c5ec812':
  Set FloatingToolbar width for portrait and landscape.
 2015-05-11 16:03:17 +00:00
John Spurlock
31f6e2dcb2 am e1e7b05b: am 4cf2ae9c: Merge "Add new metrics categories for the two notification access screens." into mnc-dev 
* commit 'e1e7b05b54799d12b2290eacf5d812b413ad25ba':
  Add new metrics categories for the two notification access screens.
 2015-05-11 16:02:09 +00:00