OSDN Git Service
Svet Ganov [Tue, 12 May 2015 00:19:36 +0000 (00:19 +0000)]
am
981de3c5: Merge "Add permission meta-state flags to support grant/revoke permission policy." into mnc-dev
* commit '
981de3c57c5a3f1f35cf5a0c6c4c5513b1643d06':
Add permission meta-state flags to support grant/revoke permission policy.
Jeff Hao [Tue, 12 May 2015 00:19:32 +0000 (00:19 +0000)]
am
54965146: am
70159dfe: am
55c4816f: am
cf6a3b91: Update ddms and profiling docs to include sample profiling.
* commit '
5496514639a49035000bd3064f2a9275b272214b':
Update ddms and profiling docs to include sample profiling.
Svet Ganov [Tue, 12 May 2015 00:15:36 +0000 (00:15 +0000)]
Merge "Add permission meta-state flags to support grant/revoke permission policy." into mnc-dev
Svet Ganov [Thu, 7 May 2015 17:48:44 +0000 (10:48 -0700)]
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
Jeff Hao [Tue, 12 May 2015 00:06:55 +0000 (00:06 +0000)]
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.
Jeff Hao [Mon, 11 May 2015 23:57:32 +0000 (23:57 +0000)]
am
55c4816f: am
cf6a3b91: Update ddms and profiling docs to include sample profiling.
* commit '
55c4816fb2aa8ea54231de6dbcb4fa22642bb75e':
Update ddms and profiling docs to include sample profiling.
Jeff Hao [Mon, 11 May 2015 23:44:15 +0000 (23:44 +0000)]
am
cf6a3b91: Update ddms and profiling docs to include sample profiling.
* commit '
cf6a3b915c2984ae573b27a46dd732811d642427':
Update ddms and profiling docs to include sample profiling.
Jean-Michel Trivi [Mon, 11 May 2015 23:08:38 +0000 (23:08 +0000)]
am
cbcbb828: Merge "Prevent NPE in MediaSessionService" into mnc-dev
* commit '
cbcbb828e8e3d1f901be00c896d816d01c17b19d':
Prevent NPE in MediaSessionService
Jean-Michel Trivi [Mon, 11 May 2015 22:57:02 +0000 (22:57 +0000)]
Merge "Prevent NPE in MediaSessionService" into mnc-dev
Jeff Hao [Mon, 11 May 2015 22:38:23 +0000 (22:38 +0000)]
am
a4492b41: Merge "Update ddms and profiling docs to include sample profiling." into mnc-dev
* commit '
a4492b418d23e3bcdb077aab5d48eb24e932fc13':
Update ddms and profiling docs to include sample profiling.
John Spurlock [Mon, 11 May 2015 22:38:19 +0000 (22:38 +0000)]
am
ceacb51e: Merge "Zen: Distinct icon for DND = total silence." into mnc-dev
* commit '
ceacb51e04c0c822f590c52916ff3a082f3a269b':
Zen: Distinct icon for DND = total silence.
Jeff Hao [Mon, 11 May 2015 22:30:57 +0000 (22:30 +0000)]
Merge "Update ddms and profiling docs to include sample profiling." into mnc-dev
Jeff Hao [Wed, 6 May 2015 01:36:42 +0000 (18:36 -0700)]
Update ddms and profiling docs to include sample profiling.
Bug:
5866094
Change-Id: Ib97990ee2fc823416b3f41856b815d4092818f98
John Spurlock [Mon, 11 May 2015 22:30:13 +0000 (22:30 +0000)]
Merge "Zen: Distinct icon for DND = total silence." into mnc-dev
Dianne Hackborn [Mon, 11 May 2015 22:26:33 +0000 (22:26 +0000)]
am
9c8600e1: Merge "Implement device idle in power manager." into mnc-dev
* commit '
9c8600e1af1af6eb2f57a965bbfe941fbd082786':
Implement device idle in power manager.
Quddus Chong [Mon, 11 May 2015 22:26:28 +0000 (22:26 +0000)]
am
b98e0712: 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 in
* commit '
b98e07129cc2cc7e51eb94ade8885f1d332efafe':
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.
Dianne Hackborn [Mon, 11 May 2015 22:22:35 +0000 (22:22 +0000)]
Merge "Implement device idle in power manager." into mnc-dev
Dianne Hackborn [Sat, 9 May 2015 00:21:48 +0000 (17:21 -0700)]
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
Quddus Chong [Mon, 11 May 2015 22:16:36 +0000 (22:16 +0000)]
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.
Quddus Chong [Mon, 11 May 2015 22:02:42 +0000 (22:02 +0000)]
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.
Quddus Chong [Mon, 11 May 2015 21:51:50 +0000 (21:51 +0000)]
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.
John Spurlock [Mon, 11 May 2015 21:46:28 +0000 (17:46 -0400)]
Zen: Distinct icon for DND = total silence.
Bug:
21032320
Change-Id: I0c7b8564c38b420081ee60ee244058b8039febf7
Doris Liu [Mon, 11 May 2015 21:43:11 +0000 (21:43 +0000)]
am
a2f04382: Merge "Use ArrayMap instead of HashMap for storing relavant nodes" into mnc-dev
* commit '
a2f043822b870f09839d025e146e37f7e7646fc4':
Use ArrayMap instead of HashMap for storing relavant nodes
Jean-Michel Trivi [Mon, 11 May 2015 21:43:05 +0000 (21:43 +0000)]
am
4c08bc0f: Merge "AudioRecord.Builder works with no or partial parameters" into mnc-dev
* commit '
4c08bc0f61e6b5051b95ac0da7eaa6cd26c63765':
AudioRecord.Builder works with no or partial parameters
Quddus Chong [Mon, 11 May 2015 21:38:46 +0000 (21:38 +0000)]
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.
Jean-Michel Trivi [Mon, 11 May 2015 21:36:27 +0000 (14:36 -0700)]
Prevent NPE in MediaSessionService
Guard against null UserRecord when dispatching a media key event.
Change-Id: I0c4a60b9c35f51a2c93baeecb80106633740de8b
Doris Liu [Mon, 11 May 2015 21:31:41 +0000 (21:31 +0000)]
Merge "Use ArrayMap instead of HashMap for storing relavant nodes" into mnc-dev
Jean-Michel Trivi [Mon, 11 May 2015 21:28:33 +0000 (21:28 +0000)]
Merge "AudioRecord.Builder works with no or partial parameters" into mnc-dev
Quddus Chong [Mon, 11 May 2015 21:23:42 +0000 (21:23 +0000)]
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
Yang Ni [Mon, 11 May 2015 21:21:54 +0000 (21:21 +0000)]
am
552518e3: Merge "Moved limit constants for kernel and script group" into mnc-dev
* commit '
552518e3c1241f643e3324f26fcc8f6d5bbde3d7':
Moved limit constants for kernel and script group
Miao Wang [Mon, 11 May 2015 21:21:49 +0000 (21:21 +0000)]
am
cb556e0d: Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev
* commit '
cb556e0d25d4be11f5441c9b23c96633cfd4ca95':
[RenderScript] hide Allocation.copyToFieldPacker()
Yang Ni [Mon, 11 May 2015 21:14:31 +0000 (21:14 +0000)]
Merge "Moved limit constants for kernel and script group" into mnc-dev
Miao Wang [Mon, 11 May 2015 21:13:46 +0000 (21:13 +0000)]
Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev
Fyodor Kupolov [Mon, 11 May 2015 21:10:59 +0000 (21:10 +0000)]
am
51506326: Merge "Fix errors during user switching" into mnc-dev
* commit '
51506326d1629ed6e1423c11ff2238c6f19b742f':
Fix errors during user switching
Quddus Chong [Tue, 7 Apr 2015 23:42:24 +0000 (16:42 -0700)]
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
Fyodor Kupolov [Mon, 11 May 2015 21:03:26 +0000 (21:03 +0000)]
Merge "Fix errors during user switching" into mnc-dev
John Spurlock [Mon, 11 May 2015 20:54:13 +0000 (20:54 +0000)]
am
fb9a664b: Merge "Zen: Reset zen + ringer modes on upgrades to M." into mnc-dev
* commit '
fb9a664b2bcb41844f1e00264ff5c5f18956a9fa':
Zen: Reset zen + ringer modes on upgrades to M.
John Spurlock [Mon, 11 May 2015 20:42:51 +0000 (20:42 +0000)]
Merge "Zen: Reset zen + ringer modes on upgrades to M." into mnc-dev
Fyodor Kupolov [Mon, 11 May 2015 19:05:15 +0000 (12:05 -0700)]
Fix errors during user switching
Fix NPE in getHomeActivityForUser. Skip system processes in
killBackgroundUserProcessesWithRecordAudioPermission.
Bug:
21016983
Change-Id: I97f9ca362f4dbf0a659e3d5d7ae6cd8dbeb6404a
Doris Liu [Mon, 11 May 2015 20:23:31 +0000 (13:23 -0700)]
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
John Spurlock [Mon, 11 May 2015 20:09:03 +0000 (16:09 -0400)]
Zen: Reset zen + ringer modes on upgrades to M.
Bug:
20886649
Change-Id: I79d0b4a31eb9d54c5e5d4cd80236fdb8340dfeb2
Svetoslav [Mon, 11 May 2015 20:16:12 +0000 (20:16 +0000)]
am
faf55219: Merge "Update permission group descriptions." into mnc-dev
* commit '
faf55219877416c1bdfbdfe5b7d24e35e9971a03':
Update permission group descriptions.
Svetoslav [Mon, 11 May 2015 20:04:48 +0000 (20:04 +0000)]
Merge "Update permission group descriptions." into mnc-dev
Svetoslav [Mon, 11 May 2015 20:01:23 +0000 (13:01 -0700)]
Update permission group descriptions.
Change-Id: Idfdd9215430481d43f5ee638ce1eb32413ffcb1e
Alex Klyubin [Mon, 11 May 2015 19:52:22 +0000 (19:52 +0000)]
am
4dc54149: Merge "Add missing value for EcIesParameterSpec.PointFormatEnum." into mnc-dev
* commit '
4dc541497dd1b25afb8b0323312800bf80f89eac':
Add missing value for EcIesParameterSpec.PointFormatEnum.
Alex Klyubin [Mon, 11 May 2015 19:52:17 +0000 (19:52 +0000)]
am
09b15d5b: Merge "Add NonNull and Nullable annotations to AndroidKeyStore API." into mnc-dev
* commit '
09b15d5bdb2eebc5e63889297789c15e97fa24b5':
Add NonNull and Nullable annotations to AndroidKeyStore API.
Alex Klyubin [Mon, 11 May 2015 19:47:54 +0000 (19:47 +0000)]
Merge "Add missing value for EcIesParameterSpec.PointFormatEnum." into mnc-dev
Alex Klyubin [Mon, 11 May 2015 19:43:45 +0000 (19:43 +0000)]
Merge "Add NonNull and Nullable annotations to AndroidKeyStore API." into mnc-dev
Alex Klyubin [Mon, 11 May 2015 19:37:18 +0000 (12:37 -0700)]
Add missing value for EcIesParameterSpec.PointFormatEnum.
Change-Id: If14fe3c3c7ed123b0fa9d5874db2ad8844e49671
Alex Klyubin [Mon, 11 May 2015 19:30:03 +0000 (12:30 -0700)]
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
Adam Powell [Mon, 11 May 2015 19:23:13 +0000 (19:23 +0000)]
am
5fccffd5: Merge "Bringing new Chooser UI closer to spec" into mnc-dev
* commit '
5fccffd573395bbd21c477f064de7c25100c3f8a':
Bringing new Chooser UI closer to spec
Miao Wang [Mon, 11 May 2015 19:18:54 +0000 (19:18 +0000)]
am
d6f3ebf1: Merge "[RenderScript] (minor) fix validation of L3 BLAS" into mnc-dev
* commit '
d6f3ebf1d0aa940d6c7edc2660f65db453e11718':
[RenderScript] (minor) fix validation of L3 BLAS
Adam Powell [Mon, 11 May 2015 19:17:28 +0000 (19:17 +0000)]
Merge "Bringing new Chooser UI closer to spec" into mnc-dev
Adam Powell [Thu, 7 May 2015 00:49:36 +0000 (17:49 -0700)]
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
Miao Wang [Mon, 11 May 2015 19:11:43 +0000 (19:11 +0000)]
Merge "[RenderScript] (minor) fix validation of L3 BLAS" into mnc-dev
Miao Wang [Fri, 1 May 2015 22:32:24 +0000 (15:32 -0700)]
[RenderScript] (minor) fix validation of L3 BLAS
bug:
21028875
Change-Id: I9fd48c57b6518e06ee1d9d7d4ca44faa96d887b0
Miao Wang [Mon, 11 May 2015 18:41:55 +0000 (11:41 -0700)]
[RenderScript] hide Allocation.copyToFieldPacker()
bug:
21027883
Change-Id: I122392bc5206ff19ea52712576d7f363e5915231
Alex Klyubin [Mon, 11 May 2015 18:37:35 +0000 (18:37 +0000)]
am
e1176f10: Merge "Fix KeyStoreTest now that begin requires parameters." into mnc-dev
* commit '
e1176f10eba5a65ad23877b210e4d8d886653e6e':
Fix KeyStoreTest now that begin requires parameters.
Alex Klyubin [Mon, 11 May 2015 18:29:50 +0000 (18:29 +0000)]
Merge "Fix KeyStoreTest now that begin requires parameters." into mnc-dev
John Reck [Mon, 11 May 2015 18:26:48 +0000 (18:26 +0000)]
am
30e175c8: Merge "Clarify assert" into mnc-dev
* commit '
30e175c8bee47bb2b840f16e28b9460a3ceaeeef':
Clarify assert
John Reck [Mon, 11 May 2015 18:16:32 +0000 (18:16 +0000)]
Merge "Clarify assert" into mnc-dev
Alex Klyubin [Mon, 11 May 2015 17:31:12 +0000 (10:31 -0700)]
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
c5e4d7af22793072a2620805f5e0e23bf15e7110)
Bug:
19509156
Change-Id: Ibc665fbc893766a683a4aadc97a64ffdf2d0d85f
Jeff Davidson [Mon, 11 May 2015 18:07:59 +0000 (18:07 +0000)]
am
0a775ce9: Ensure VPN consent is not revoked in prepare/establish.
* commit '
0a775ce9801f03071d1e9bcc177d79e6fe350702':
Ensure VPN consent is not revoked in prepare/establish.
John Reck [Mon, 11 May 2015 17:18:12 +0000 (10:18 -0700)]
Clarify assert
Bug:
20918138
Change-Id: I39a9f8bbfb3752f9a6e5f5215ed8cd3c93ce87fc
Yang Ni [Tue, 5 May 2015 19:41:19 +0000 (12:41 -0700)]
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
7b2a46fee0f95b9ae2485db36e0d279730623c4a)
Jean-Michel Trivi [Fri, 8 May 2015 22:10:09 +0000 (15:10 -0700)]
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
Chirag Shah [Mon, 11 May 2015 17:52:38 +0000 (17:52 +0000)]
am
3ce72722: Merge "Revert the AssistAction class." into mnc-dev
* commit '
3ce72722ca14ad9e84ca54920bb2829696f68d53':
Revert the AssistAction class.
Jean-Michel Trivi [Mon, 11 May 2015 17:52:32 +0000 (17:52 +0000)]
am
3b12261c: Merge "android.media.AudioRecord.Builder: no "capture preset"" into mnc-dev
* commit '
3b12261c50851deedef64974a05a8cbff2b4c2ea':
android.media.AudioRecord.Builder: no "capture preset"
Jeff Davidson [Mon, 27 Apr 2015 22:02:48 +0000 (15:02 -0700)]
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
Chirag Shah [Mon, 11 May 2015 17:39:28 +0000 (17:39 +0000)]
Merge "Revert the AssistAction class." into mnc-dev
Jean-Michel Trivi [Mon, 11 May 2015 17:39:28 +0000 (17:39 +0000)]
Merge "android.media.AudioRecord.Builder: no "capture preset"" into mnc-dev
Mady Mellor [Mon, 11 May 2015 17:38:36 +0000 (17:38 +0000)]
am
15445a65: Merge "Provide a way for a stylus to access the quick settings menu" into mnc-dev
* commit '
15445a652bfca60d67fc95df8c80f529f8e42979':
Provide a way for a stylus to access the quick settings menu
John Spurlock [Mon, 11 May 2015 17:38:31 +0000 (17:38 +0000)]
am
b7c9b225: Merge "QS: Defer tile view updates when opening the detail panel." into mnc-dev
* commit '
b7c9b2259f1976e2fd25771aa9ca3dd8f3afa335':
QS: Defer tile view updates when opening the detail panel.
Mady Mellor [Mon, 11 May 2015 17:28:45 +0000 (17:28 +0000)]
Merge "Provide a way for a stylus to access the quick settings menu" into mnc-dev
John Spurlock [Mon, 11 May 2015 17:27:56 +0000 (17:27 +0000)]
Merge "QS: Defer tile view updates when opening the detail panel." into mnc-dev
George Mount [Mon, 11 May 2015 17:27:02 +0000 (17:27 +0000)]
am
3dec0d47: Merge "Disable input during Activity Transition." into mnc-dev
* commit '
3dec0d47215b56e3bd3e6f3287cf2c966bf8c22f':
Disable input during Activity Transition.
John Reck [Mon, 11 May 2015 17:26:54 +0000 (17:26 +0000)]
am
78fad572: Merge "Add a few missing asserts" into mnc-dev
* commit '
78fad5724d0210f85b6688ef2eec9859d2b92601':
Add a few missing asserts
John Spurlock [Mon, 11 May 2015 17:11:24 +0000 (13:11 -0400)]
QS: Defer tile view updates when opening the detail panel.
Bug:
20916542
Change-Id: I8e367fb2f8274eafb8d142fbfb54bc9be66b7546
George Mount [Mon, 11 May 2015 17:19:02 +0000 (17:19 +0000)]
Merge "Disable input during Activity Transition." into mnc-dev
John Reck [Mon, 11 May 2015 17:15:25 +0000 (17:15 +0000)]
Merge "Add a few missing asserts" into mnc-dev
Jason Monk [Mon, 11 May 2015 17:11:52 +0000 (17:11 +0000)]
am
d567d88e: Merge "SettingsLib: Do wifi processing in background" into mnc-dev
* commit '
d567d88e1017e45e2ccecea812fd53122c1b9ce0':
SettingsLib: Do wifi processing in background
Jason Monk [Mon, 11 May 2015 16:57:22 +0000 (16:57 +0000)]
Merge "SettingsLib: Do wifi processing in background" into mnc-dev
Narayan Kamath [Mon, 11 May 2015 16:54:06 +0000 (16:54 +0000)]
Merge "Fix string breakage due to merge
cff23c2f96f7dce80e3df0a1" into mnc-ub-dev
John Reck [Mon, 11 May 2015 16:43:47 +0000 (09:43 -0700)]
Add a few missing asserts
Bug:
20918138
Change-Id: I6823cfe531ff6f63a7d9fde22278e6780726c9f1
Narayan Kamath [Mon, 11 May 2015 16:42:02 +0000 (17:42 +0100)]
Fix string breakage due to merge
cff23c2f96f7dce80e3df0a1
Change-Id: I73f352e8d99ca11de4821f0b489ce8f2ab0f0ecf
Jason Monk [Fri, 8 May 2015 20:54:18 +0000 (16:54 -0400)]
SettingsLib: Do wifi processing in background
Bug:
19520495
Change-Id: Iefad932bd523b26a19e5f902133563341aea7426
Zoltan Szatmary-Ban [Mon, 11 May 2015 16:34:03 +0000 (16:34 +0000)]
am
11a1086f: Merge "Improve javadoc on android.permission.PACKAGE_USAGE_STATS" into mnc-dev
* commit '
11a1086f69abafc17e4fc6db38622d126a1a7ecc':
Improve javadoc on android.permission.PACKAGE_USAGE_STATS
Steve McKay [Mon, 11 May 2015 16:33:59 +0000 (16:33 +0000)]
am
b3100f4b: Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-dev
* commit '
b3100f4b13159deb0b5736aedca1659dfe3c762b':
Delete StandaloneActivity from M (DO NOT MERGE)
Zoltan Szatmary-Ban [Mon, 11 May 2015 16:24:49 +0000 (16:24 +0000)]
Merge "Improve javadoc on android.permission.PACKAGE_USAGE_STATS" into mnc-dev
Steve McKay [Mon, 11 May 2015 16:21:01 +0000 (16:21 +0000)]
Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-dev
John Spurlock [Mon, 11 May 2015 16:20:22 +0000 (16:20 +0000)]
am
13ea79de: Merge "Volume: Separate tint colors for active vs inactive sliders." into mnc-dev
* commit '
13ea79dea443831c1936f9ac47109144705149f6':
Volume: Separate tint colors for active vs inactive sliders.
Geoff Mendal [Mon, 11 May 2015 16:20:18 +0000 (16:20 +0000)]
am
7846d966: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
7846d966f5b0d78fa819b56d45be3b668f34dcfb':
Import translations. DO NOT MERGE
Amith Yamasani [Mon, 11 May 2015 16:20:14 +0000 (16:20 +0000)]
am
a5b2684c: Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev
* commit '
a5b2684c25add3ba6ebc43c27a1abc6bce2b2af4':
Rename *AppIdle to *AppInactive per api-council
Steve McKay [Thu, 7 May 2015 21:08:20 +0000 (14:08 -0700)]
Delete StandaloneActivity from M (DO NOT MERGE)
The activity is already disabled by default.
Fix an issue where copy support error handling was attempting to invoke StandaloneActivity.
Change-Id: If15c312a183cae1b2a84517e7f7b3123c11bd619
John Spurlock [Mon, 11 May 2015 16:15:21 +0000 (16:15 +0000)]
Merge "Volume: Separate tint colors for active vs inactive sliders." into mnc-dev
Geoff Mendal [Mon, 11 May 2015 16:15:00 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
John Spurlock [Mon, 11 May 2015 16:12:07 +0000 (12:12 -0400)]
Volume: Separate tint colors for active vs inactive sliders.
Bug:
20889746
Change-Id: I98f6a0eab8f2db41ea7e1ba8e141752ef774de9e
Amith Yamasani [Mon, 11 May 2015 16:11:13 +0000 (16:11 +0000)]
Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev
John Spurlock [Mon, 11 May 2015 16:09:11 +0000 (16:09 +0000)]
am
c454f786: Merge "Volume: Use teal color for "End now"." into mnc-dev
* commit '
c454f786e2301b26afee3809a293a7fadd65434a':
Volume: Use teal color for "End now".
Geoff Mendal [Mon, 11 May 2015 16:02:26 +0000 (09:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9eba7c09bb5f603b1260ede6a3de590670af76ff
Auto-generated-cl: translation import