Commit Graph

191691 Commits

Author SHA1 Message Date
Selim Cinek
b05f5739bb Fixed a crash with the voice interaction service
Bug: 20925281
Change-Id: I136014ebc12c3afcb154722a8fec44b1d5f003e9
(cherry picked from commit 64904d39f8)
2015-05-12 00:41:15 +00:00
Selim Cinek
737bff3476 Fixed a bug where the HUN would interfere with the normal touches
When a hun came in or went away, the touchable regions were not
enforced correctly due to a race condition. This lead to the user
grabing the notification panel unintentionally and ripping him
out of the normal touch state.
Also fixed a small bug where the alpha was not correctly animating
sometimes and the HUN shadow would still draw.

Bug: 20956211
Change-Id: Iae1fef5825b3d2b8b4128cc8c3272019194cd819
(cherry picked from commit 8b4a06e9e2)
2015-05-12 00:39:36 +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
Jeff Hao
5496514639 am 70159dfe: am 55c4816f: am cf6a3b91: Update ddms and profiling docs to include sample profiling.
* commit '70159dfeb6bde35cb001e25240c7e676bf87932f':
  Update ddms and profiling docs to include sample profiling.
2015-05-12 00:06:55 +00:00
Jeff Hao
70159dfeb6 am 55c4816f: am cf6a3b91: Update ddms and profiling docs to include sample profiling.
* commit '55c4816fb2aa8ea54231de6dbcb4fa22642bb75e':
  Update ddms and profiling docs to include sample profiling.
2015-05-11 23:57:32 +00:00
Jeff Hao
55c4816fb2 am cf6a3b91: Update ddms and profiling docs to include sample profiling.
* commit 'cf6a3b915c2984ae573b27a46dd732811d642427':
  Update ddms and profiling docs to include sample profiling.
2015-05-11 23:44:15 +00:00
Jean-Michel Trivi
cbcbb828e8 Merge "Prevent NPE in MediaSessionService" into mnc-dev 2015-05-11 22:57:03 +00:00
Jeff Hao
a4492b418d Merge "Update ddms and profiling docs to include sample profiling." into mnc-dev 2015-05-11 22:30:58 +00:00
Jeff Hao
cf6a3b915c Update ddms and profiling docs to include sample profiling.
Bug: 5866094

Change-Id: Ib97990ee2fc823416b3f41856b815d4092818f98
2015-05-11 22:30:20 +00:00
John Spurlock
ceacb51e04 Merge "Zen: Distinct icon for DND = total silence." into mnc-dev 2015-05-11 22:30:14 +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
Quddus Chong
b98e07129c am ce4408a1: am a7577843: am d43ec638: am 174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented un
* commit 'ce4408a104300006a3296bfd2f2aad9c0f2fd9dc':
  docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
2015-05-11 22:16:36 +00:00
Quddus Chong
ce4408a104 am a7577843: am d43ec638: am 174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to r
* commit 'a75778438fde2e7ec5322a69930ff49ded48f4c1':
  docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
2015-05-11 22:02:42 +00:00
Quddus Chong
a75778438f am d43ec638: am 174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a devic
* commit 'd43ec6380ce04f4c0830cd35d1dbd7b3050799d4':
  docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
2015-05-11 21:51:50 +00:00
John Spurlock
4ec8b60295 Zen: Distinct icon for DND = total silence.
Bug: 21032320
Change-Id: I0c7b8564c38b420081ee60ee244058b8039febf7
2015-05-11 17:49:36 -04:00
Quddus Chong
d43ec6380c am 174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator
* commit '174dc3ba607965cf1dd0578f83ce373fa74d0f65':
  docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
2015-05-11 21:38:46 +00:00
Jean-Michel Trivi
e492d43512 Prevent NPE in MediaSessionService
Guard against null UserRecord when dispatching a media key event.

Change-Id: I0c4a60b9c35f51a2c93baeecb80106633740de8b
2015-05-11 14:36:27 -07: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
Jean-Michel Trivi
4c08bc0f61 Merge "AudioRecord.Builder works with no or partial parameters" into mnc-dev 2015-05-11 21:28:34 +00:00
Quddus Chong
174dc3ba60 Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator." into lmp-docs 2015-05-11 21:23:43 +00:00
Yang Ni
552518e3c1 Merge "Moved limit constants for kernel and script group" into mnc-dev 2015-05-11 21:14:32 +00:00
Miao Wang
cb556e0d25 Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev 2015-05-11 21:13:47 +00:00
Quddus Chong
4bc762a919 docs: Added training docs for Android unit testing tools and APIs.
This training covers techniques for running unit tests on local
machines, using mock objects in local unit tests, and building
instrumented unit tests to run on a device or emulator.

Change-Id: I9fee9ac3bd7382fb158145600b1850775edb687d
2015-05-11 14:09:25 -07:00
Fyodor Kupolov
51506326d1 Merge "Fix errors during user switching" into mnc-dev 2015-05-11 21:03:27 +00:00
John Spurlock
fb9a664b2b Merge "Zen: Reset zen + ringer modes on upgrades to M." into mnc-dev 2015-05-11 20:42:52 +00:00
Fyodor Kupolov
bcb6c1eb9e Fix errors during user switching
Fix NPE in getHomeActivityForUser. Skip system processes in
killBackgroundUserProcessesWithRecordAudioPermission.

Bug: 21016983
Change-Id: I97f9ca362f4dbf0a659e3d5d7ae6cd8dbeb6404a
2015-05-11 13:39:22 -07: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
John Spurlock
e11ae11631 Zen: Reset zen + ringer modes on upgrades to M.
Bug: 20886649
Change-Id: I79d0b4a31eb9d54c5e5d4cd80236fdb8340dfeb2
2015-05-11 16:20:16 -04:00
Svetoslav
faf5521987 Merge "Update permission group descriptions." into mnc-dev 2015-05-11 20:04:49 +00:00
Svetoslav
b397d9fe2e Update permission group descriptions.
Change-Id: Idfdd9215430481d43f5ee638ce1eb32413ffcb1e
2015-05-11 13:04:08 -07:00
Alex Klyubin
4dc541497d Merge "Add missing value for EcIesParameterSpec.PointFormatEnum." into mnc-dev 2015-05-11 19:47:55 +00:00
Alex Klyubin
09b15d5bdb Merge "Add NonNull and Nullable annotations to AndroidKeyStore API." into mnc-dev 2015-05-11 19:43:46 +00:00
Alex Klyubin
322e2c3a12 Add missing value for EcIesParameterSpec.PointFormatEnum.
Change-Id: If14fe3c3c7ed123b0fa9d5874db2ad8844e49671
2015-05-11 12:37:45 -07:00
Alex Klyubin
54bb1596e4 Add NonNull and Nullable annotations to AndroidKeyStore API.
This is to enable Android Lint and Android Studio to flag nullness
issues at compile time.

Bug: 18088752
Change-Id: I21033b8fcdd989d08c89b50685e47fbb9c74acbf
2015-05-11 12:30:03 -07: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
d6f3ebf1d0 Merge "[RenderScript] (minor) fix validation of L3 BLAS" into mnc-dev 2015-05-11 19:11:44 +00:00
Miao Wang
50a8ff108f [RenderScript] (minor) fix validation of L3 BLAS
bug: 21028875

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

Change-Id: I122392bc5206ff19ea52712576d7f363e5915231
2015-05-11 11:51:09 -07:00
Alex Klyubin
e1176f10eb Merge "Fix KeyStoreTest now that begin requires parameters." into mnc-dev 2015-05-11 18:29:54 +00:00
John Reck
30e175c8be Merge "Clarify assert" into mnc-dev 2015-05-11 18:16:33 +00:00
Alex Klyubin
292102459b Fix KeyStoreTest now that begin requires parameters.
Keystore's begin operation now requires parameters which describe the
operation (e.g., algorithm, block mode, padding). This adjusts
KeyStoreTest to provide the necessary parameters.

(cherry-picked from commit c5e4d7af22)

Bug: 19509156
Change-Id: Ibc665fbc893766a683a4aadc97a64ffdf2d0d85f
2015-05-11 11:12:34 -07:00
John Reck
9298c54141 Clarify assert
Bug: 20918138
Change-Id: I39a9f8bbfb3752f9a6e5f5215ed8cd3c93ce87fc
2015-05-11 11:03:43 -07:00
Yang Ni
9310e3db45 Moved limit constants for kernel and script group
b/20728113

so that we can share them with support lib.

Change-Id: I231c0d20c41ee53342d8a975c2db5a31854b9d40
(cherry picked from commit 7b2a46fee0)
2015-05-11 11:01:32 -07:00
Jean-Michel Trivi
46011f8871 AudioRecord.Builder works with no or partial parameters
Complete missing build-time parameters for encoding and channel
  mask, according to documentation.

Bug 20894895

Change-Id: I61f9bfab374effeeded5ae782c4e8513b7310c06
2015-05-11 10:58:16 -07:00
Jeff Davidson
0a775ce980 Ensure VPN consent is not revoked in prepare/establish.
Covers cases where VPN is prepared, but the consent bit has been lost,
e.g. because updates were uninstalled on the current VPN app. In this
case we want prepare to re-trigger the consent flow, and we do not
want establish() to work.

So, when prepare(package, null) is called, as VpnService.prepare()
will do, if we would have otherwise taken no action and returned true
because the VPN was already prepared, we now check if package has lost
its consent and unprepare the VPN (so that it can be prepared by the
VpnSettings ConfirmDialog).

Bug: 18491424
Change-Id: I8fa60dbc2b95e15f9ce61f9b7e6735db745babba
2015-05-11 17:50:07 +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