OSDN Git Service

android-x86/frameworks-base.git
9 years agoAllow exemption to idle apps at periodic intervals
Amith Yamasani [Fri, 8 May 2015 23:36:21 +0000 (16:36 -0700)]
Allow exemption to idle apps at periodic intervals

Triggers are device idle mode changing as well as
internal delayed message handlers.

Bug: 20066058
Change-Id: I0627cfbcc16cfc2b8ac7d298fd2c681a5a6571dd

9 years agoMerge "Idle timebase" into mnc-dev
Amith Yamasani [Tue, 12 May 2015 13:04:29 +0000 (13:04 +0000)]
Merge "Idle timebase" into mnc-dev

9 years agoMerge "Remove SLEEP and POWER from wake key list." into mnc-dev
Michael Wright [Tue, 12 May 2015 12:12:47 +0000 (12:12 +0000)]
Merge "Remove SLEEP and POWER from wake key list." into mnc-dev

9 years agoFix file descriptor leak when opening invalid archives.
Narayan Kamath [Mon, 11 May 2015 14:45:36 +0000 (15:45 +0100)]
Fix file descriptor leak when opening invalid archives.

I've inspected all other callers of OpenArchive and this seems
to be the only broken one. The easiest way to reproduce this is
by using getPackageArchiveInfo or by adding an asset path that
isn't a valid APK.

bug: https://code.google.com/p/android/issues/detail?id=171099
Change-Id: I41cd85d20f26ad47968e2a6f1384cc03330b558b

9 years agoMerge "Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon" into...
Ricky Wai [Tue, 12 May 2015 09:35:59 +0000 (09:35 +0000)]
Merge "Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon" into mnc-dev

9 years agoMerge "Tweak SystemUpdatePolicy according to API review." into mnc-dev
Rubin Xu [Tue, 12 May 2015 09:06:09 +0000 (09:06 +0000)]
Merge "Tweak SystemUpdatePolicy according to API review." into mnc-dev

9 years agoMerge "Fix Floating toolbar is not refreshed when dragging insertion handle" into...
Clara Bayarri [Tue, 12 May 2015 09:06:04 +0000 (09:06 +0000)]
Merge "Fix Floating toolbar is not refreshed when dragging insertion handle" into mnc-dev

9 years agoMerge "TIF: Rename requestUnblockContent to unblockContent" into mnc-dev
Jae Seo [Tue, 12 May 2015 05:21:26 +0000 (05:21 +0000)]
Merge "TIF: Rename requestUnblockContent to unblockContent" into mnc-dev

9 years agoTIF: Rename requestUnblockContent to unblockContent
Jae Seo [Thu, 12 Mar 2015 02:29:46 +0000 (19:29 -0700)]
TIF: Rename requestUnblockContent to unblockContent

The method TvView.requestUnblockContent doesn't match the name of the
corresponding method in TvInputService, onUnblockContent, hence changed
the name to make it consistent with the current naming scheme.
This change deprecated the requestUnblockContent method as the first
step.

Bug: 19337627
Change-Id: I530209c4dca66305da90ffded7199fa3c1c1780c

9 years agoMerge "TIF: add more documentation on Session.setOverlayViewEnabled()." into mnc-dev
Dongwon Kang [Tue, 12 May 2015 04:51:07 +0000 (04:51 +0000)]
Merge "TIF: add more documentation on Session.setOverlayViewEnabled()." into mnc-dev

9 years agoMerge "TIF: Unhide the surface layout API" into mnc-dev
Jae Seo [Tue, 12 May 2015 04:43:06 +0000 (04:43 +0000)]
Merge "TIF: Unhide the surface layout API" into mnc-dev

9 years agoTIF: Unhide the surface layout API
Jae Seo [Thu, 23 Apr 2015 20:19:15 +0000 (13:19 -0700)]
TIF: Unhide the surface layout API

Also fixed some comments to make them more consistent with now public
API.

Bug: 20254168
Change-Id: I62fcdace742603ffd3756c5188c8cf37ccf964ba

9 years agoam f3c04204: am 13e39e3f: am c1e97347: Merge "docs: studio 1.2.1.1 updates" into...
Joe Fernandez [Tue, 12 May 2015 04:24:53 +0000 (04:24 +0000)]
am f3c04204: am 13e39e3f: am c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs

* commit 'f3c042045f70b74d700c3d96429f45b93606e56b':
  docs: studio 1.2.1.1 updates

9 years agoam 3da32f77: am b1e9430a: am c5ced5d3: Fix prototype for startMethodTracingSampling...
Jeff Hao [Tue, 12 May 2015 04:24:46 +0000 (04:24 +0000)]
am 3da32f77: am b1e9430a: am c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs.

* commit '3da32f77fb99a21c35cfc914641e34b949c2d623':
  Fix prototype for startMethodTracingSampling in profiling docs.

9 years agoam 13e39e3f: am c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
Joe Fernandez [Tue, 12 May 2015 04:09:42 +0000 (04:09 +0000)]
am 13e39e3f: am c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs

* commit '13e39e3fd28544ff13639938455a8b7d593b835b':
  docs: studio 1.2.1.1 updates

9 years agoam b1e9430a: am c5ced5d3: Fix prototype for startMethodTracingSampling in profiling...
Jeff Hao [Tue, 12 May 2015 04:09:38 +0000 (04:09 +0000)]
am b1e9430a: am c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs.

* commit 'b1e9430a9d653937ae9ee2ae9c3e60860b30ba4d':
  Fix prototype for startMethodTracingSampling in profiling docs.

9 years agoam c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
Joe Fernandez [Tue, 12 May 2015 04:00:31 +0000 (04:00 +0000)]
am c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs

* commit 'c1e973477d635e08ab656bba3dbaf73927feaae8':
  docs: studio 1.2.1.1 updates

9 years agoam c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs.
Jeff Hao [Tue, 12 May 2015 04:00:24 +0000 (04:00 +0000)]
am c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs.

* commit 'c5ced5d354678c6eaefbfab11035b4f05361264a':
  Fix prototype for startMethodTracingSampling in profiling docs.

9 years agoMerge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
Joe Fernandez [Tue, 12 May 2015 03:51:23 +0000 (03:51 +0000)]
Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs

9 years agoMerge "Fingerprint: Add Set Active Group" into mnc-dev
Jim Miller [Tue, 12 May 2015 01:22:13 +0000 (01:22 +0000)]
Merge "Fingerprint: Add Set Active Group" into mnc-dev

9 years agoMerge "Fix ViewGroup caching defaults" into mnc-dev
Chris Craik [Tue, 12 May 2015 01:18:31 +0000 (01:18 +0000)]
Merge "Fix ViewGroup caching defaults" into mnc-dev

9 years agoMerge "Add user selectable Default Browser feature - part 6" into mnc-dev
Fabrice Di Meglio [Tue, 12 May 2015 00:52:57 +0000 (00:52 +0000)]
Merge "Add user selectable Default Browser feature - part 6" into mnc-dev

9 years agoAdd user selectable Default Browser feature - part 6
Fabrice Di Meglio [Tue, 12 May 2015 00:46:23 +0000 (17:46 -0700)]
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

9 years agoIdle timebase
Amith Yamasani [Fri, 8 May 2015 23:36:21 +0000 (16:36 -0700)]
Idle timebase

Use screen on time as timebase for idling out apps
that have been inactive.

Store the time when an app was last active as an additional
package state in UsageStats. Compare it to screenOnTime to decide
if it's inactive.

Exclude device idle whitelist from apps that can go inactive.

Bug: 20066058

Change-Id: I709f9f31a9affa7ca6e1ae3e4c5729c5fb221669

9 years agoGave more context on an accesibility string
Selim Cinek [Tue, 12 May 2015 00:36:57 +0000 (17:36 -0700)]
Gave more context on an accesibility string

Bug: 21024091
Change-Id: I298786cc71a7368298df620d699a49ef29adec06

9 years agoFix prototype for startMethodTracingSampling in profiling docs.
Jeff Hao [Tue, 12 May 2015 00:33:49 +0000 (17:33 -0700)]
Fix prototype for startMethodTracingSampling in profiling docs.

Change-Id: I1bb48be7d154ef2d513c8f611c52a7c89414737c
(cherry picked from commit 3755c3d8bcc3d0f22eb7a775ec7a689feb7e1725)

9 years agoFixed a bug that the user could not drag down on the heads up
Selim Cinek [Tue, 12 May 2015 00:00:39 +0000 (17:00 -0700)]
Fixed a bug that the user could not drag down on the heads up

Change-Id: I4a806c88d9b2bf4d176dab32ed793c1105ffd237
(cherry picked from commit dcc3138db295c513aeda322a447f9dd1295e180e)

9 years agoMerge "Fix prototype for startMethodTracingSampling in profiling docs." into mnc-dev
Jeff Hao [Tue, 12 May 2015 00:42:09 +0000 (00:42 +0000)]
Merge "Fix prototype for startMethodTracingSampling in profiling docs." into mnc-dev

9 years agoFixed a crash with the voice interaction service
Selim Cinek [Mon, 11 May 2015 23:28:42 +0000 (16:28 -0700)]
Fixed a crash with the voice interaction service

Bug: 20925281
Change-Id: I136014ebc12c3afcb154722a8fec44b1d5f003e9
(cherry picked from commit 64904d39f8062b026c2d4c09c9a5a26532e60bb6)

9 years agoFixed a bug where the HUN would interfere with the normal touches
Selim Cinek [Fri, 8 May 2015 23:08:35 +0000 (16:08 -0700)]
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 8b4a06e9e269140c93c1a9ef5add008f7610d1a4)

9 years agoFix prototype for startMethodTracingSampling in profiling docs.
Jeff Hao [Tue, 12 May 2015 00:33:49 +0000 (17:33 -0700)]
Fix prototype for startMethodTracingSampling in profiling docs.

Change-Id: I1bb48be7d154ef2d513c8f611c52a7c89414737c

9 years agoMerge "Add permission meta-state flags to support grant/revoke permission policy...
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

9 years agoAdd permission meta-state flags to support grant/revoke permission policy.
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

9 years agoam 70159dfe: am 55c4816f: am cf6a3b91: Update ddms and profiling docs to include...
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.

9 years agoam 55c4816f: am cf6a3b91: 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.

9 years agodocs: studio 1.2.1.1 updates
Rich Slogar [Mon, 11 May 2015 23:54:55 +0000 (16:54 -0700)]
docs: studio 1.2.1.1 updates

Change-Id: I0e0f25873b06a135e6fd68f1a2aad463d204c4e5

9 years agoam cf6a3b91: 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.

9 years agoMerge "Prevent NPE in MediaSessionService" into mnc-dev
Jean-Michel Trivi [Mon, 11 May 2015 22:57:02 +0000 (22:57 +0000)]
Merge "Prevent NPE in MediaSessionService" into mnc-dev

9 years agoFix ViewGroup caching defaults
Chris Craik [Mon, 11 May 2015 22:33:11 +0000 (15:33 -0700)]
Fix ViewGroup caching defaults

bug:20718535

Revert to established defaults of these two properties.

Change-Id: I798cfa2e53b26eafd30b191ad6e3b721fe6bd249

9 years agoMerge "Update ddms and profiling docs to include sample profiling." into mnc-dev
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

9 years agoUpdate ddms and profiling docs to include sample profiling.
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

9 years agoMerge "Zen: Distinct icon for DND = total silence." into mnc-dev
John Spurlock [Mon, 11 May 2015 22:30:13 +0000 (22:30 +0000)]
Merge "Zen: Distinct icon for DND = total silence." into mnc-dev

9 years agoMerge "Implement device idle in power manager." into mnc-dev
Dianne Hackborn [Mon, 11 May 2015 22:22:35 +0000 (22:22 +0000)]
Merge "Implement device idle in power manager." into mnc-dev

9 years agoImplement device idle in power manager.
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

9 years agoam ce4408a1: am a7577843: am d43ec638: am 174dc3ba: Merge "docs: Added training docs...
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.

9 years agoam a7577843: am d43ec638: am 174dc3ba: Merge "docs: Added training docs for Android...
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.

9 years agoam d43ec638: am 174dc3ba: Merge "docs: Added training docs for Android unit testing...
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.

9 years agoZen: Distinct icon for DND = total silence.
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

9 years agoam 174dc3ba: Merge "docs: Added training docs for Android unit testing tools and...
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.

9 years agoPrevent NPE in MediaSessionService
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

9 years agoMerge "Use ArrayMap instead of HashMap for storing relavant nodes" into mnc-dev
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

9 years agoMerge "AudioRecord.Builder works with no or partial parameters" 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

9 years agoMerge "docs: Added training docs for Android unit testing tools and APIs. This traini...
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

9 years agoMerge "Moved limit constants for kernel and script group" into mnc-dev
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

9 years agoMerge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev
Miao Wang [Mon, 11 May 2015 21:13:46 +0000 (21:13 +0000)]
Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev

9 years agodocs: Added training docs for Android unit testing tools and APIs.
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

9 years agoMerge "Fix errors during user switching" into mnc-dev
Fyodor Kupolov [Mon, 11 May 2015 21:03:26 +0000 (21:03 +0000)]
Merge "Fix errors during user switching" into mnc-dev

9 years agoMerge "Zen: Reset zen + ringer modes on upgrades to M." into mnc-dev
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

9 years agoFingerprint: Add Set Active Group
Sasha Levitskiy [Fri, 8 May 2015 21:31:48 +0000 (14:31 -0700)]
Fingerprint: Add Set Active Group

Change-Id: Ie9d63c5f948c9610bd6b19a76bffab5ae0070620
Signed-off-by: Sasha Levitskiy <sanek@google.com>
9 years agoFix errors during user switching
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

9 years agoUse ArrayMap instead of HashMap for storing relavant nodes
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

9 years agoZen: Reset zen + ringer modes on upgrades to M.
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

9 years agoMerge "Update permission group descriptions." into mnc-dev
Svetoslav [Mon, 11 May 2015 20:04:48 +0000 (20:04 +0000)]
Merge "Update permission group descriptions." into mnc-dev

9 years agoUpdate permission group descriptions.
Svetoslav [Mon, 11 May 2015 20:01:23 +0000 (13:01 -0700)]
Update permission group descriptions.

Change-Id: Idfdd9215430481d43f5ee638ce1eb32413ffcb1e

9 years agoMerge "Add missing value for EcIesParameterSpec.PointFormatEnum." into mnc-dev
Alex Klyubin [Mon, 11 May 2015 19:47:54 +0000 (19:47 +0000)]
Merge "Add missing value for EcIesParameterSpec.PointFormatEnum." into mnc-dev

9 years agoMerge "Add NonNull and Nullable annotations to AndroidKeyStore API." 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

9 years agoAdd missing value for EcIesParameterSpec.PointFormatEnum.
Alex Klyubin [Mon, 11 May 2015 19:37:18 +0000 (12:37 -0700)]
Add missing value for EcIesParameterSpec.PointFormatEnum.

Change-Id: If14fe3c3c7ed123b0fa9d5874db2ad8844e49671

9 years agoAdd NonNull and Nullable annotations to AndroidKeyStore API.
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

9 years agoMerge "Bringing new Chooser UI closer to spec" into mnc-dev
Adam Powell [Mon, 11 May 2015 19:17:28 +0000 (19:17 +0000)]
Merge "Bringing new Chooser UI closer to spec" into mnc-dev

9 years agoBringing new Chooser UI closer to spec
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

9 years agoMerge "[RenderScript] (minor) fix validation of L3 BLAS" into mnc-dev
Miao Wang [Mon, 11 May 2015 19:11:43 +0000 (19:11 +0000)]
Merge "[RenderScript] (minor) fix validation of L3 BLAS" into mnc-dev

9 years ago[RenderScript] (minor) fix validation of L3 BLAS
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

9 years ago[RenderScript] hide Allocation.copyToFieldPacker()
Miao Wang [Mon, 11 May 2015 18:41:55 +0000 (11:41 -0700)]
[RenderScript] hide Allocation.copyToFieldPacker()

bug: 21027883

Change-Id: I122392bc5206ff19ea52712576d7f363e5915231

9 years agoMerge "Fix KeyStoreTest now that begin requires parameters." into mnc-dev
Alex Klyubin [Mon, 11 May 2015 18:29:50 +0000 (18:29 +0000)]
Merge "Fix KeyStoreTest now that begin requires parameters." into mnc-dev

9 years agoMerge "Clarify assert" into mnc-dev
John Reck [Mon, 11 May 2015 18:16:32 +0000 (18:16 +0000)]
Merge "Clarify assert" into mnc-dev

9 years agoFix KeyStoreTest now that begin requires parameters.
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

9 years agoClarify assert
John Reck [Mon, 11 May 2015 17:18:12 +0000 (10:18 -0700)]
Clarify assert

Bug: 20918138
Change-Id: I39a9f8bbfb3752f9a6e5f5215ed8cd3c93ce87fc

9 years agoMoved limit constants for kernel and script group
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)

9 years agoAudioRecord.Builder works with no or partial parameters
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

9 years agoEnsure VPN consent is not revoked in prepare/establish.
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

9 years agoMerge "Revert the AssistAction class." into mnc-dev
Chirag Shah [Mon, 11 May 2015 17:39:28 +0000 (17:39 +0000)]
Merge "Revert the AssistAction class." into mnc-dev

9 years agoMerge "android.media.AudioRecord.Builder: no "capture preset"" 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

9 years agoTweak SystemUpdatePolicy according to API review.
Rubin Xu [Tue, 5 May 2015 15:57:37 +0000 (16:57 +0100)]
Tweak SystemUpdatePolicy according to API review.

Make SystemUpdatePolicy Parcelable; hide public constructor and
expose static builder methods.

Bug: 20820025
Change-Id: I594ba3c7e5514551134ba6c866b24498b66506bf

9 years agoMerge "Provide a way for a stylus to access the quick settings menu" into mnc-dev
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

9 years agoMerge "QS: Defer tile view updates when opening the detail panel." 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

9 years agoQS: Defer tile view updates when opening the detail panel.
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

9 years agoMerge "Disable input during Activity Transition." into mnc-dev
George Mount [Mon, 11 May 2015 17:19:02 +0000 (17:19 +0000)]
Merge "Disable input during Activity Transition." into mnc-dev

9 years agoMerge "Add a few missing asserts" 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

9 years agoMerge "SettingsLib: Do wifi processing in background" into mnc-dev
Jason Monk [Mon, 11 May 2015 16:57:22 +0000 (16:57 +0000)]
Merge "SettingsLib: Do wifi processing in background" into mnc-dev

9 years agoAdd a few missing asserts
John Reck [Mon, 11 May 2015 16:43:47 +0000 (09:43 -0700)]
Add a few missing asserts

Bug: 20918138
Change-Id: I6823cfe531ff6f63a7d9fde22278e6780726c9f1

9 years agoSettingsLib: Do wifi processing in background
Jason Monk [Fri, 8 May 2015 20:54:18 +0000 (16:54 -0400)]
SettingsLib: Do wifi processing in background

Bug: 19520495
Change-Id: Iefad932bd523b26a19e5f902133563341aea7426

9 years agoMerge "Improve javadoc on android.permission.PACKAGE_USAGE_STATS" into mnc-dev
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

9 years agoMerge "Delete StandaloneActivity from M (DO NOT MERGE)" 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

9 years agoDelete StandaloneActivity from M (DO NOT MERGE)
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

9 years agoMerge "Volume: Separate tint colors for active vs inactive sliders." into mnc-dev
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

9 years agoMerge "Import translations. DO NOT MERGE" 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

9 years agoVolume: Separate tint colors for active vs inactive sliders.
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

9 years agoMerge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev
Amith Yamasani [Mon, 11 May 2015 16:11:13 +0000 (16:11 +0000)]
Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev

9 years agoImport translations. DO NOT MERGE
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

9 years agoImprove javadoc on android.permission.PACKAGE_USAGE_STATS
Zoltan Szatmary-Ban [Wed, 6 May 2015 09:52:14 +0000 (10:52 +0100)]
Improve javadoc on android.permission.PACKAGE_USAGE_STATS

Bug: 20642656
Change-Id: Ib0cedee487950dab16134edd383ce5bd5374ff65