OSDN Git Service

android-x86/frameworks-base.git
9 years agoImplement tools:list_item for RecyclerView.
Deepanshu Gupta [Tue, 7 Jul 2015 01:31:20 +0000 (18:31 -0700)]
Implement tools:list_item for RecyclerView.

It's now possible to use tools:list_item attribute for RecyclerView to
point to a default layout, rather than always using a TextView.

Change-Id: I5d522b2f0ca38b420fddfcb0f73a26d95707da79

9 years agoAdd roundess to configuration
Deepanshu Gupta [Tue, 7 Jul 2015 01:27:00 +0000 (18:27 -0700)]
Add roundess to configuration

Change-Id: Icc85b38dd091fc5aa13092d6abb06ac169f7b0b5

9 years agoUpdate tests per new layoutlib_api
Deepanshu Gupta [Tue, 7 Jul 2015 01:26:41 +0000 (18:26 -0700)]
Update tests per new layoutlib_api

Change-Id: Idc89ffceaf171abcf2b579f4e934b514ef209210

9 years agoMerge "Ringtone: add support for volume control and looping" into mnc-dev
Jean-Michel Trivi [Mon, 6 Jul 2015 23:07:23 +0000 (23:07 +0000)]
Merge "Ringtone: add support for volume control and looping" into mnc-dev

9 years agoMerge "Add easy way to get device idle whitelist." into mnc-dev
Dianne Hackborn [Mon, 6 Jul 2015 22:24:50 +0000 (22:24 +0000)]
Merge "Add easy way to get device idle whitelist." into mnc-dev

9 years agoAdd easy way to get device idle whitelist.
Dianne Hackborn [Mon, 6 Jul 2015 22:13:37 +0000 (15:13 -0700)]
Add easy way to get device idle whitelist.

Change-Id: I28b0df69e7fb16b5d7542b1eae626bbfdd9a4c1c

9 years agoMerge "Don't prevent windows from drawing when they are just moving" into mnc-dev
Jorim Jaggi [Mon, 6 Jul 2015 22:07:32 +0000 (22:07 +0000)]
Merge "Don't prevent windows from drawing when they are just moving" into mnc-dev

9 years agoMerge "Avoid IllegalStateException when generating/importing keys." into mnc-dev
Alex Klyubin [Mon, 6 Jul 2015 21:50:42 +0000 (21:50 +0000)]
Merge "Avoid IllegalStateException when generating/importing keys." into mnc-dev

9 years agoam 076d4f40: am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior...
David Friedman [Mon, 6 Jul 2015 21:41:05 +0000 (21:41 +0000)]
am 076d4f40: am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs

* commit '076d4f40d849d1d1e628fa6b210e690020d04956':
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.

9 years agoMerge "Unhide signal strength constants used by getLevel." into mnc-dev
Casey Ho [Mon, 6 Jul 2015 21:39:21 +0000 (21:39 +0000)]
Merge "Unhide signal strength constants used by getLevel." into mnc-dev

9 years agoam 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for...
David Friedman [Mon, 6 Jul 2015 21:27:05 +0000 (21:27 +0000)]
am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs

* commit '7bd9b634c42b500466cf416566d27da229d6ca1c':
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.

9 years agoMerge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 releas...
David Friedman [Mon, 6 Jul 2015 21:15:05 +0000 (21:15 +0000)]
Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs

9 years agoam 77b6971b: am c66c7622: Docs: Clarification of language and typo fix for work merge...
David Friedman [Mon, 6 Jul 2015 21:13:19 +0000 (21:13 +0000)]
am 77b6971b: am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.

* commit '77b6971b4699bd94c9a4b044108f264f1ddfe31f':
  Docs: Clarification of language and typo fix for work merged from CL 716303.

9 years agoDon't prevent windows from drawing when they are just moving
Jorim Jaggi [Thu, 2 Jul 2015 00:16:27 +0000 (17:16 -0700)]
Don't prevent windows from drawing when they are just moving

Bug: 21292010
Change-Id: I0cf459d75e9749afa58a4b8649457b3908c8adeb

9 years agoam c66c7622: Docs: Clarification of language and typo fix for work merged from CL...
David Friedman [Mon, 6 Jul 2015 20:56:51 +0000 (20:56 +0000)]
am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.

* commit 'c66c7622eadb04c1ca258725ae7125626824c324':
  Docs: Clarification of language and typo fix for work merged from CL 716303.

9 years agoMerge "Clearer message when failing to draw a SW layer" into mnc-dev
Chris Craik [Mon, 6 Jul 2015 20:29:54 +0000 (20:29 +0000)]
Merge "Clearer message when failing to draw a SW layer" into mnc-dev

9 years agoam 5977c487: am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview...
David Friedman [Mon, 6 Jul 2015 20:09:11 +0000 (20:09 +0000)]
am 5977c487: am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs

* commit '5977c4879b166eb1b5c0d6a7a361dde515e1d502':
  docs: M Preview 2 - release notes

9 years agoDocs: Clarification of language and typo fix for work merged from CL 716303.
David Friedman [Mon, 6 Jul 2015 20:04:16 +0000 (13:04 -0700)]
Docs: Clarification of language and typo fix for work merged from CL 716303.

Change-Id: I04f062696926b00ccfbd45fef368061dd968efbb

9 years agoam 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
David Friedman [Mon, 6 Jul 2015 19:53:11 +0000 (19:53 +0000)]
am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs

* commit '07661e3b73cee9720d79d0d09f7a60104ce4cabc':
  docs: M Preview 2 - release notes

9 years agoMerge "docs: M Preview 2 - release notes" into mnc-preview-docs
David Friedman [Mon, 6 Jul 2015 19:38:07 +0000 (19:38 +0000)]
Merge "docs: M Preview 2 - release notes" into mnc-preview-docs

9 years agoMerge "Only allow fingerprint auth for the current user" into mnc-dev
Jim Miller [Mon, 6 Jul 2015 19:18:03 +0000 (19:18 +0000)]
Merge "Only allow fingerprint auth for the current user" into mnc-dev

9 years agoam e7fb3318: am b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug...
David Friedman [Mon, 6 Jul 2015 18:43:37 +0000 (18:43 +0000)]
am e7fb3318: am b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs

* commit 'e7fb33180d689bbdddae03ab0afe730e4d312f45':
  Docs: Localized pages for Distribution on DAC. Bug: 20503707

9 years agoam b9e4e0d0: am afea7a99: docs: Updating permissions preview for Preview 2.
Andrew Solovay [Mon, 6 Jul 2015 18:43:31 +0000 (18:43 +0000)]
am b9e4e0d0: am afea7a99: docs: Updating permissions preview for Preview 2.

* commit 'b9e4e0d0f13ba40e95590f42c351af9b1dba0c5b':
  docs: Updating permissions preview for Preview 2.

9 years agoOnly allow fingerprint auth for the current user
Jim Miller [Tue, 16 Jun 2015 22:05:48 +0000 (15:05 -0700)]
Only allow fingerprint auth for the current user

This prevents fingerprint access from activities
for a user that isn't the current user.

Fixes bug 20223481

Change-Id: I360f90972fe63f5066f701a3efda355a7cb11338

9 years agoam b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707...
David Friedman [Mon, 6 Jul 2015 18:29:11 +0000 (18:29 +0000)]
am b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs

* commit 'b50a279fb68aace181787780187c9d3485c84f50':
  Docs: Localized pages for Distribution on DAC. Bug: 20503707

9 years agoam afea7a99: docs: Updating permissions preview for Preview 2.
Andrew Solovay [Mon, 6 Jul 2015 18:29:06 +0000 (18:29 +0000)]
am afea7a99: docs: Updating permissions preview for Preview 2.

* commit 'afea7a9982de194893cf1a789bc2625d192727c4':
  docs: Updating permissions preview for Preview 2.

9 years agoAvoid IllegalStateException when generating/importing keys.
Alex Klyubin [Mon, 6 Jul 2015 17:31:07 +0000 (10:31 -0700)]
Avoid IllegalStateException when generating/importing keys.

This avoids IllegalStateException when generating/importing keys which
require user authentication when the system is not configured to
generate/import such keys (e.g., secure lock screen not set up).

The documentation states that before generating/importing such keys
apps should check (using public API) whether the system is in a
suitable state. However, some apps are not doing that and instead
catching the IllegalStateException thrown during key
generation/import. This is a bad practice because this exception is an
undocumented implementation detail and should thus not be depended
upon.

This CL addresses this issue as follows:
1. Key(Pair)Generator.init now throws a checked
   InvalidAlgorithmParameterException when the system is in a wrong
   state. Because in most uses of Key(Pair)Generator .init is
   immediately followed by .generate, this prevents .generate from
   encountering this state and does so using a checked exception
   which is part of public API.
2. Key import rethrows the IllegalStateException as a checked
   KeyStoreException which is meant to be thrown if the key cannot be
   imported for any reason. Key(Pair)Generator.generate unfortunately
   cannot throw any checked exceptions and thus has to continue
   throwing unchecked exceptions.

Bug: 22262809
Change-Id: Ic0f7b7a90e0ba63df9139c79b80a8649d2645d2a

9 years agoMerge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview...
David Friedman [Mon, 6 Jul 2015 18:20:37 +0000 (18:20 +0000)]
Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs

9 years agodocs: Updating permissions preview for Preview 2.
Andrew Solovay [Mon, 22 Jun 2015 23:27:36 +0000 (16:27 -0700)]
docs: Updating permissions preview for Preview 2.

Currently just contains doc additions/clarifications that apply to
both Preview 1 and Preview 2, and also the addition of the new
'storage' bucket and the new shouldShowRequestPermissionRationale()
method.

See first comment for doc stage location.

Change-Id: I0b97741c45e117c5de3fa1a85c9ba0d5e927fa8f

9 years agoMerge "Fix problems with StaticLayout indentation" into mnc-dev
Raph Levien [Mon, 6 Jul 2015 18:08:39 +0000 (18:08 +0000)]
Merge "Fix problems with StaticLayout indentation" into mnc-dev

9 years agoMerge "BatteryStats: Fix issue with method parameter order..." into mnc-dev
Adam Lesinski [Mon, 6 Jul 2015 18:00:24 +0000 (18:00 +0000)]
Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev

9 years agoMerge "Permission to view shared storage for all users." into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 17:58:57 +0000 (17:58 +0000)]
Merge "Permission to view shared storage for all users." into mnc-dev

9 years agoMerge "Fix DocumentsUI animation regression." into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 17:57:50 +0000 (17:57 +0000)]
Merge "Fix DocumentsUI animation regression." into mnc-dev

9 years agoMerge "Handle missing migration source volume." into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 17:57:48 +0000 (17:57 +0000)]
Merge "Handle missing migration source volume." into mnc-dev

9 years agoMerge "Reconcile private volumes when mounted." into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 17:57:44 +0000 (17:57 +0000)]
Merge "Reconcile private volumes when mounted." into mnc-dev

9 years agoPermission to view shared storage for all users.
Jeff Sharkey [Mon, 6 Jul 2015 16:45:55 +0000 (09:45 -0700)]
Permission to view shared storage for all users.

Typical apps are restricted so they can only view shared storage
belonging to the user they're running as.  However, a handful of
system components need access to shared storage across all users,
such as DefaultContainerService and SystemUI.

Since WRITE_MEDIA_STORAGE already offers this functionality by
bypassing any FUSE emulation, reuse it to grant the "sdcard_rw" GID
which is no longer handed out to third-party apps.  Then we change
the FUSE daemon to allow the "sdcard_rw" GID to see shared storage
of all users.

Bug: 19995822
Change-Id: I504c2a179ba74f142ed0d32da5baa69f4212cd82

9 years agoMerge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev
Eino-Ville Talvala [Mon, 6 Jul 2015 17:51:42 +0000 (17:51 +0000)]
Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev

9 years agoMerge "Maybe fix issue #22283836 -- package manager NPE." into mnc-dev
Dianne Hackborn [Mon, 6 Jul 2015 17:50:26 +0000 (17:50 +0000)]
Merge "Maybe fix issue #22283836 -- package manager NPE." into mnc-dev

9 years agoDocs: Localized pages for Distribution on DAC.
David Friedman [Tue, 30 Jun 2015 19:02:41 +0000 (12:02 -0700)]
Docs: Localized pages for Distribution on DAC.
Bug: 20503707

Change-Id: I7e45012b34d57bad426d930399eb1afbf3f5f859

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 6 Jul 2015 17:33:57 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 17:29:06 +0000 (10:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6c69d2d259e0341bb42765b0940a607599df666b
Auto-generated-cl: translation import

9 years agoMerge "Fix Fade out during Activity Transition." into mnc-dev
George Mount [Mon, 6 Jul 2015 17:25:44 +0000 (17:25 +0000)]
Merge "Fix Fade out during Activity Transition." into mnc-dev

9 years agoFix Fade out during Activity Transition.
George Mount [Tue, 30 Jun 2015 23:54:00 +0000 (16:54 -0700)]
Fix Fade out during Activity Transition.

Bug 22181705

The Fade Transition sets the transitionAlpha in onTransitionEnd.
I previously changed Visibility to only do it in onAnimationEnd,
so the onTransitionEnd overrides the Visibility's version. This
fixes that change.

Change-Id: I7df478897b6fcfec20999965e297925b65a1448b

9 years agoMerge "Fix wifi crash" into mnc-dev
Jason Monk [Mon, 6 Jul 2015 17:19:17 +0000 (17:19 +0000)]
Merge "Fix wifi crash" into mnc-dev

9 years agoBatteryStats: Fix issue with method parameter order...
Adam Lesinski [Mon, 6 Jul 2015 17:17:24 +0000 (10:17 -0700)]
BatteryStats: Fix issue with method parameter order...

Argh, this explains some weird instances of negative power
given to Wakelock usage. Realtime and uptime were switched in the
parameter list, and since they're both longs, compiler was happy.

Bug:22295225
Change-Id: I6759504f2690baf66af567d8b1a6d0478bc22228

9 years agoMerge "If user ejects a storage from details, take user to... ... the storage list...
Makoto Onuki [Mon, 6 Jul 2015 17:13:27 +0000 (17:13 +0000)]
Merge "If user ejects a storage from details, take user to... ... the storage list view" into mnc-dev

9 years agoMerge "Minor doc fixes for VoiceInteractor." into mnc-dev
Barnaby James [Mon, 6 Jul 2015 17:08:13 +0000 (17:08 +0000)]
Merge "Minor doc fixes for VoiceInteractor." into mnc-dev

9 years agoRingtone: add support for volume control and looping
Jean-Michel Trivi [Tue, 30 Jun 2015 19:34:48 +0000 (12:34 -0700)]
Ringtone: add support for volume control and looping

Bug 22182606

Change-Id: Ied910b9fe02a5da9c4822a107ee884677c8b4991

9 years agoFix wifi crash
Jason Monk [Mon, 6 Jul 2015 16:55:48 +0000 (12:55 -0400)]
Fix wifi crash

Handle clearing state for resume on the same worker thread as everything
else, this way there can't be concurrent modification.

Bug: 22040227
Change-Id: I9ac78a19fc126c8103f3218e657ca93911d3890d

9 years agoMaybe fix issue #22283836 -- package manager NPE.
Dianne Hackborn [Mon, 6 Jul 2015 16:52:59 +0000 (09:52 -0700)]
Maybe fix issue #22283836 -- package manager NPE.

Change-Id: I0383b9a4f1e0b872b3b427e6ad42fd8aa309b7ab

9 years agoFix a typo causing NPE in restricted profiles
Amith Yamasani [Mon, 6 Jul 2015 16:24:08 +0000 (09:24 -0700)]
Fix a typo causing NPE in restricted profiles

Bug: 22287398
Change-Id: Iec19d890c7b0b7ffed3381dc3f5a9b3e761362a7

9 years agoMerge "Clean up Hyphenator file reading" into mnc-dev
Raph Levien [Mon, 6 Jul 2015 16:07:35 +0000 (16:07 +0000)]
Merge "Clean up Hyphenator file reading" into mnc-dev

9 years agoClean up Hyphenator file reading
Raph Levien [Mon, 6 Jul 2015 16:01:36 +0000 (09:01 -0700)]
Clean up Hyphenator file reading

The old code made invalid assumptions about read() behavior and
failed to clean up properly in case of error. This patch changes the
file reading to use IoUtils.readFileAsString, which handles that.

Bug: 21020457
Change-Id: If9b54955c20a20a4ed5e8381d0c7e9c920d0639a

9 years agoMerge "Show basic feature warning for default granted permissions" into mnc-dev
Svet Ganov [Mon, 6 Jul 2015 15:51:57 +0000 (15:51 +0000)]
Merge "Show basic feature warning for default granted permissions" into mnc-dev

9 years agoMerge "Improve request permission docs" into mnc-dev
Svet Ganov [Mon, 6 Jul 2015 15:48:44 +0000 (15:48 +0000)]
Merge "Improve request permission docs" into mnc-dev

9 years agoMerge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev
George Mount [Mon, 6 Jul 2015 14:39:39 +0000 (14:39 +0000)]
Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 6 Jul 2015 13:58:49 +0000 (13:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 13:56:00 +0000 (08:56 -0500)]
Import translations. DO NOT MERGE

Change-Id: I16a0ddf1bed80ef9b985cca96eec87e48d342982
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 6 Jul 2015 13:51:48 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 13:50:33 +0000 (08:50 -0500)]
Import translations. DO NOT MERGE

Change-Id: Ia90a9400d718b5ef61f55ed4d6c5eb9fe48d9667
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 6 Jul 2015 13:48:34 +0000 (13:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 13:47:43 +0000 (08:47 -0500)]
Import translations. DO NOT MERGE

Change-Id: I1b900ec1f54720fab0915cede28dd79fbcb70d5c
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 13:43:33 +0000 (08:43 -0500)]
Import translations. DO NOT MERGE

Change-Id: Icd52bfb7b30de7dbc2c7c7e7f073a4fddb5fa5e3
Auto-generated-cl: translation import

9 years agoFix two parsing bugs in new DHCP client.
Lorenzo Colitti [Mon, 6 Jul 2015 03:29:43 +0000 (12:29 +0900)]
Fix two parsing bugs in new DHCP client.

1. We don't parse PAD options properly, leading in failure to
   parse packets sent by DHCP servers that put the end of options
   marker after pad options and at an odd offset.
2. We get the DhcpResults vendorInfo from the wrong option type
   (60 instead of 43).

Fix these and add unit tests for the offer packets sent by a few
different DHCP servers.

Bug: 21955617
Bug: 22281295
Change-Id: I5d13f1a6a3ff0b53112f18f3db8792fa32ad2da3

9 years agoFix DocumentsUI animation regression.
Jeff Sharkey [Sun, 5 Jul 2015 21:44:48 +0000 (14:44 -0700)]
Fix DocumentsUI animation regression.

Various fragments need backgrounds to protect their contents during
animation transitions.

Bug: 22232368
Change-Id: I4ce4c57650f9b64b3c6101d829dd484417585410

9 years agoHandle missing migration source volume.
Jeff Sharkey [Sun, 5 Jul 2015 21:17:27 +0000 (14:17 -0700)]
Handle missing migration source volume.

Users can try migrating primary storage while the current location
is missing/unmounted.  Fail gracefully instead of runtime restarting.

Bug: 21927076
Change-Id: I40645f8ccea05154e7cbacd188f6cba5f4dbbdc4

9 years agoMerge "Fixing log typo. s/realted/related" into mnc-dev
Ian Pedowitz [Sun, 5 Jul 2015 01:13:43 +0000 (01:13 +0000)]
Merge "Fixing log typo.  s/realted/related" into mnc-dev

9 years agoFixing log typo. s/realted/related
Ian Pedowitz [Sun, 5 Jul 2015 01:07:33 +0000 (18:07 -0700)]
Fixing log typo.  s/realted/related

Bug: 22273408
Change-Id: I756f56ee80d5840bd734249826eb658cbf472921

9 years agoReconcile private volumes when mounted.
Jeff Sharkey [Sat, 4 Jul 2015 01:08:41 +0000 (18:08 -0700)]
Reconcile private volumes when mounted.

Many things can happen while a private volume is ejected, so we need
to reconcile newly mounted volumes against known state.

First, user IDs can be recycled, so we store the serial number in the
extended attributes of the /data/user/[id] directory inode.  Since a
serial number is always unique, we can quickly determine if a user
directory "10" really belongs to the current user "10".  When we
detect a mismatched serial number, we destroy all data belonging to
that user.  Gracefully handles upgrade case and assumes current serial
number is valid when none is defined.

Second, we destroy apps that we find no record of, either due to
uninstallation while the volume was unmounted, or reinstallation on
another volume.

When mounting a volume, ensure that data directories exist for all
current users.  Similarly, create data directories on all mounted
volumes when creating a user.  When forgetting a volume, gracefully
uninstall any apps that had been installed on that volume.

Bug: 2067408220275572
Change-Id: I4e3448837f7c03daf00d71681ebdc96e3d8b9cc9

9 years agoFix app ops aidl as it is also used from native.
Svet Ganov [Fri, 3 Jul 2015 23:22:26 +0000 (16:22 -0700)]
Fix app ops aidl as it is also used from native.

bug:22248271

Change-Id: Ic3f31d1ee4d27c1483c9d19929c19946d4c815c6

9 years agoImprove request permission docs
Svet Ganov [Fri, 3 Jul 2015 23:03:53 +0000 (16:03 -0700)]
Improve request permission docs

bug:22252258

Change-Id: Ife19eb6b1e17b43a824379d2a039ff1c441bebdd

9 years agoShow basic feature warning for default granted permissions
Svet Ganov [Fri, 3 Jul 2015 19:03:02 +0000 (12:03 -0700)]
Show basic feature warning for default granted permissions

bug:22174223

Change-Id: Ie8209e1f678ac459893151b5125e86eb5025aad8

9 years agoMerge "KeyChain: annotate with @WorkerThread" into mnc-dev
Robin Lee [Fri, 3 Jul 2015 16:48:11 +0000 (16:48 +0000)]
Merge "KeyChain: annotate with @WorkerThread" into mnc-dev

9 years agoMerge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev
Lorenzo Colitti [Fri, 3 Jul 2015 02:37:41 +0000 (02:37 +0000)]
Merge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev

9 years agoMerge "Grant the default gallery app storage permissions" into mnc-dev
Svet Ganov [Thu, 2 Jul 2015 21:37:54 +0000 (21:37 +0000)]
Merge "Grant the default gallery app storage permissions" into mnc-dev

9 years agoMerge "Make granting default SMS and Phone permissions robust" into mnc-dev
Svetoslav [Thu, 2 Jul 2015 21:37:30 +0000 (21:37 +0000)]
Merge "Make granting default SMS and Phone permissions robust" into mnc-dev

9 years agoMerge "Add capability to indicate a conference will never have children." into mnc-dev
Anthony Lee [Thu, 2 Jul 2015 18:33:48 +0000 (18:33 +0000)]
Merge "Add capability to indicate a conference will never have children." into mnc-dev

9 years agoMerge "Remove ExternalMediaFormatActivity" into mnc-dev
Rubin Xu [Thu, 2 Jul 2015 16:22:43 +0000 (16:22 +0000)]
Merge "Remove ExternalMediaFormatActivity" into mnc-dev

9 years agoRemove ExternalMediaFormatActivity
Rubin Xu [Wed, 1 Jul 2015 17:07:46 +0000 (18:07 +0100)]
Remove ExternalMediaFormatActivity

This activity is no longer used by any part of the framework.

Bug: 9433509
Change-Id: Iace394b7a11b75ed75b2eefc05990626a7e68ac2

9 years agoMerge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev
Alex Chau [Thu, 2 Jul 2015 14:37:01 +0000 (14:37 +0000)]
Merge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev

9 years agoMerge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev
Nicolas Prevot [Thu, 2 Jul 2015 12:28:42 +0000 (12:28 +0000)]
Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev

9 years agoMerge "Fix the case where an intent bounces several times between users." into mnc-dev
Nicolas Prevot [Thu, 2 Jul 2015 10:27:55 +0000 (10:27 +0000)]
Merge "Fix the case where an intent bounces several times between users." into mnc-dev

9 years agoMake the VPN notice connectivity changes on stacked interfaces.
Lorenzo Colitti [Thu, 2 Jul 2015 04:03:03 +0000 (13:03 +0900)]
Make the VPN notice connectivity changes on stacked interfaces.

Currently, the VPN code only looks at base interfaces, so if
464xlat is in use, it will never disconnect when its underlying
network has disconnected. Use getAllInterfaceNames().contains()
instead of just comparing the base interface name.

Bug: 19336810
Change-Id: Id1ba2c80a09cec5098c6f512acdc0a05a939e9f3

9 years agoGrant the default gallery app storage permissions
Svet Ganov [Thu, 2 Jul 2015 03:46:02 +0000 (20:46 -0700)]
Grant the default gallery app storage permissions

bug:22127986

Change-Id: I1ecd49d57d410bf10734fea4e0c92e6e5028d648

9 years agoMake granting default SMS and Phone permissions robust
Svetoslav [Thu, 2 Jul 2015 02:49:58 +0000 (19:49 -0700)]
Make granting default SMS and Phone permissions robust

The default dialer and sms apps are provided by the telecomm
stak which is brought up asynchronously as a service to which
the system binds. Hence, by the time we grant default permissions
this service is not bound and we do not know the default dialer
(accidentally the default SMS app is available before the service
is up). Now the default permission grant code is robust to handle
both cases of the default sms and phone apps being available
at grant time or asynchronously.

bug:22208642

Change-Id: I6385a0432368731aa9caea046d57eccbfb5abac0

9 years agoam 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug:...
David Friedman [Thu, 2 Jul 2015 02:45:30 +0000 (02:45 +0000)]
am 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs

* commit '2ebfc3f78483842c789688da47b721f60b4149e4':
  Docs: Localization of Design pages on DAC. Bug: 20503708

9 years agoam 5adc6ba0: am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chines...
David Friedman [Thu, 2 Jul 2015 02:45:24 +0000 (02:45 +0000)]
am 5adc6ba0: am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs

* commit '5adc6ba056de056f73ee484b859b45657da0c1fb':
  Docs: Fixes a terminology error in simplified Chinese on-boarding docs

9 years agoam fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into...
David Friedman [Thu, 2 Jul 2015 02:33:03 +0000 (02:33 +0000)]
am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs

* commit 'fa8eb1e0d42e7b10447a285d9b2a583d367c3cad':
  Docs: Localization of Design pages on DAC. Bug: 20503708

9 years agoam 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding...
David Friedman [Thu, 2 Jul 2015 02:32:59 +0000 (02:32 +0000)]
am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs

* commit '7e4dc922d949c7aec0a2a813e9487067e47e4c51':
  Docs: Fixes a terminology error in simplified Chinese on-boarding docs

9 years agoMerge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev
Abodunrinwa Toki [Thu, 2 Jul 2015 02:29:32 +0000 (02:29 +0000)]
Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev

9 years agoMerge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview...
David Friedman [Thu, 2 Jul 2015 02:24:12 +0000 (02:24 +0000)]
Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs

9 years agoMerge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into...
David Friedman [Thu, 2 Jul 2015 02:23:53 +0000 (02:23 +0000)]
Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs

9 years agoDocs: Localization of Design pages on DAC.
David Friedman [Tue, 30 Jun 2015 20:09:48 +0000 (13:09 -0700)]
Docs: Localization of Design pages on DAC.
Bug: 20503708

Change-Id: Id3a4f5900d99125a1475d939d43444f46555018c

9 years agoam b85962df: am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am...
Wale Ogunwale [Thu, 2 Jul 2015 02:14:44 +0000 (02:14 +0000)]
am b85962df: am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit 'b85962df1ee6be2bba4c26fbd0964ade2c73a9c9':
  Prevent system uid component from running in an app process

9 years agoam e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am...
Wale Ogunwale [Thu, 2 Jul 2015 01:36:17 +0000 (01:36 +0000)]
am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit 'e155eef4881c1ec8063a62619fe29aa6e8074b71':
  Prevent system uid component from running in an app process

9 years agoam 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am...
Wale Ogunwale [Thu, 2 Jul 2015 01:22:06 +0000 (01:22 +0000)]
am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit '2735ac71e6d8d1c00b95104057ac9365abb485d9':
  Prevent system uid component from running in an app process

9 years agoam 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am...
Wale Ogunwale [Thu, 2 Jul 2015 01:07:44 +0000 (01:07 +0000)]
am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit '22cd16a01f55149507c1d5d71c408987a71737fc':
  Prevent system uid component from running in an app process

9 years agoam 2adcfa1c: am 657d20ee: am 44000724: am 5278cea1: am d72dc762: am ec425a19: am...
Wale Ogunwale [Thu, 2 Jul 2015 01:00:02 +0000 (01:00 +0000)]
am 2adcfa1c: am 657d20ee: am 44000724: am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev

* commit '2adcfa1c02ecc695b86b8b11c1c4eb9891d4337e':
  Prevent system uid component from running in an app process

9 years agoam 655b08c3: am b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge "Prevent syste...
Wale Ogunwale [Thu, 2 Jul 2015 00:59:56 +0000 (00:59 +0000)]
am 655b08c3: am b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev

* commit '655b08c38a08d9adb35b75cf340d70068ba81204':
  Prevent system uid component from running in an app process

9 years agoam aabc9869: am 03850591: Handle outsets when resized is called due to rotation.
Filip Gruszczynski [Thu, 2 Jul 2015 00:59:48 +0000 (00:59 +0000)]
am aabc9869: am 03850591: Handle outsets when resized is called due to rotation.

* commit 'aabc9869a95928660271b7022e2756fff2654013':
  Handle outsets when resized is called due to rotation.