OSDN Git Service
Jeff Sharkey [Mon, 6 Jul 2015 18:12:28 +0000 (18:12 +0000)]
am
7fd3c296: Merge "Permission to view shared storage for all users." into mnc-dev
* commit '
7fd3c296f1991e321e4c69a5e7f918cc3d252625':
Permission to view shared storage for all users.
Jeff Sharkey [Mon, 6 Jul 2015 18:12:21 +0000 (18:12 +0000)]
am
6d842f63: Merge "Fix DocumentsUI animation regression." into mnc-dev
* commit '
6d842f63a00e34edb583f9fdd6f233c20dcd00f2':
Fix DocumentsUI animation regression.
Jeff Sharkey [Mon, 6 Jul 2015 18:12:11 +0000 (18:12 +0000)]
am
246d6984: Merge "Handle missing migration source volume." into mnc-dev
* commit '
246d69849951e4dbc0726a7faa58ecb71f7cf460':
Handle missing migration source volume.
Jeff Sharkey [Mon, 6 Jul 2015 18:12:04 +0000 (18:12 +0000)]
am
38cae6c8: Merge "Reconcile private volumes when mounted." into mnc-dev
* commit '
38cae6c8bcb86236b21d69f852473351c0c1d82a':
Reconcile private volumes when mounted.
Eino-Ville Talvala [Mon, 6 Jul 2015 17:59:22 +0000 (17:59 +0000)]
am
539d18c5: Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev
* commit '
539d18c5a9eac6b2cf23b3af38e2635279a106dd':
Camera2: Remove FREEFORM cropping requirement from FULL
Dianne Hackborn [Mon, 6 Jul 2015 17:59:15 +0000 (17:59 +0000)]
am
dcd96ead: Merge "Maybe fix issue #
22283836 -- package manager NPE." into mnc-dev
* commit '
dcd96ead8457466fb3dfb5978eb1e7e5b560ba91':
Maybe fix issue #
22283836 -- package manager NPE.
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
Jeff Sharkey [Mon, 6 Jul 2015 17:57:50 +0000 (17:57 +0000)]
Merge "Fix DocumentsUI animation regression." 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
Jeff Sharkey [Mon, 6 Jul 2015 17:57:44 +0000 (17:57 +0000)]
Merge "Reconcile private volumes when mounted." into mnc-dev
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
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
Dianne Hackborn [Mon, 6 Jul 2015 17:50:26 +0000 (17:50 +0000)]
Merge "Maybe fix issue #
22283836 -- package manager NPE." into mnc-dev
Geoff Mendal [Mon, 6 Jul 2015 17:47:52 +0000 (17:47 +0000)]
am
e2222d12: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e2222d12c8338ef4aa1e653583507937aad53cd4':
Import translations. DO NOT MERGE
George Mount [Mon, 6 Jul 2015 17:34:47 +0000 (17:34 +0000)]
am
20f71891: Merge "Fix Fade out during Activity Transition." into mnc-dev
* commit '
20f71891c4ae420398b96cc6a77f0c43316e6717':
Fix Fade out during Activity Transition.
Jason Monk [Mon, 6 Jul 2015 17:34:40 +0000 (17:34 +0000)]
am
d369d074: Merge "Fix wifi crash" into mnc-dev
* commit '
d369d074f5bdbcc9229bf52e12f3bde025cf41cd':
Fix wifi crash
Geoff Mendal [Mon, 6 Jul 2015 17:33:57 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
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
George Mount [Mon, 6 Jul 2015 17:25:44 +0000 (17:25 +0000)]
Merge "Fix Fade out during Activity Transition." into mnc-dev
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
Jason Monk [Mon, 6 Jul 2015 17:19:17 +0000 (17:19 +0000)]
Merge "Fix wifi crash" into mnc-dev
Makoto Onuki [Mon, 6 Jul 2015 17:18:36 +0000 (17:18 +0000)]
am
dfd6301f: Merge "If user ejects a storage from details, take user to... ... the storage list view" into mnc-dev
* commit '
dfd6301fa2570ae5b012dd964847531bdfdb3f4b':
If user ejects a storage from details, take user to... ... the storage list view
Barnaby James [Mon, 6 Jul 2015 17:18:29 +0000 (17:18 +0000)]
am
c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev
* commit '
c1e3ac321faea5717e1767bf2091334dde310eb7':
Minor doc fixes for VoiceInteractor.
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
Barnaby James [Mon, 6 Jul 2015 17:08:13 +0000 (17:08 +0000)]
Merge "Minor doc fixes for VoiceInteractor." into mnc-dev
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
Dianne Hackborn [Mon, 6 Jul 2015 16:52:59 +0000 (09:52 -0700)]
Maybe fix issue #
22283836 -- package manager NPE.
Change-Id: I0383b9a4f1e0b872b3b427e6ad42fd8aa309b7ab
Amith Yamasani [Mon, 6 Jul 2015 16:49:21 +0000 (16:49 +0000)]
am
a72eac60: Fix a typo causing NPE in restricted profiles
* commit '
a72eac60c7a34089c8e288f03ce031172e3b36b4':
Fix 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
Raph Levien [Mon, 6 Jul 2015 16:20:12 +0000 (16:20 +0000)]
am
401aa9d8: Merge "Clean up Hyphenator file reading" into mnc-dev
* commit '
401aa9d807bdc568f26cd40bfc96d26449267678':
Clean up Hyphenator file reading
Raph Levien [Mon, 6 Jul 2015 16:07:35 +0000 (16:07 +0000)]
Merge "Clean up Hyphenator file reading" into mnc-dev
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
Svet Ganov [Mon, 6 Jul 2015 15:56:25 +0000 (15:56 +0000)]
am
10c111ed: Merge "Show basic feature warning for default granted permissions" into mnc-dev
* commit '
10c111ed35a0282ddf5dda540c53e3831bc9b0ec':
Show basic feature warning for default granted permissions
Svet Ganov [Mon, 6 Jul 2015 15:56:18 +0000 (15:56 +0000)]
am
cb8d2e21: Merge "Improve request permission docs" into mnc-dev
* commit '
cb8d2e21564ec749696dc3095524dafffa915c38':
Improve request permission docs
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
Svet Ganov [Mon, 6 Jul 2015 15:48:44 +0000 (15:48 +0000)]
Merge "Improve request permission docs" into mnc-dev
George Mount [Mon, 6 Jul 2015 14:54:44 +0000 (14:54 +0000)]
am
7fe86c47: Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev
* commit '
7fe86c4753e88058a7f1a1bf8d0302df9a64bd2e':
Fix docs for ViewAnimationUtils.createCircularReveal
George Mount [Mon, 6 Jul 2015 14:39:39 +0000 (14:39 +0000)]
Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev
Geoff Mendal [Mon, 6 Jul 2015 14:05:28 +0000 (14:05 +0000)]
am
a5595900: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
a559590043e32f670813e062f042f9e642297edf':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 14:05:22 +0000 (14:05 +0000)]
am
210b38d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
210b38d767f38812f5866057b7d074e80d287ffa':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 13:58:49 +0000 (13:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
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
Geoff Mendal [Mon, 6 Jul 2015 13:51:48 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 6 Jul 2015 13:51:15 +0000 (13:51 +0000)]
am
b0819373: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
b0819373e08e27578d14799ede8f3a08119b60a0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 13:51:06 +0000 (13:51 +0000)]
am
88b4a0ac: (-s ours) Import translations. DO NOT MERGE
* commit '
88b4a0ac56a2a006af2b8702c4c36590b287fcda':
Import 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
Geoff Mendal [Mon, 6 Jul 2015 13:48:34 +0000 (13:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
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
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
Lorenzo Colitti [Mon, 6 Jul 2015 07:35:27 +0000 (07:35 +0000)]
am
b0b3d0bc: Fix two parsing bugs in new DHCP client.
* commit '
b0b3d0bcfb0af678d4c85bec63722f976ffb01cf':
Fix 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
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
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
Ian Pedowitz [Sun, 5 Jul 2015 16:49:35 +0000 (16:49 +0000)]
am
738a8dfc: Merge "Fixing log typo. s/realted/related" into mnc-dev
* commit '
738a8dfcdca8536cf00077f8184d75e1c5b52b9c':
Fixing log typo. s/realted/related
Svet Ganov [Sun, 5 Jul 2015 16:49:27 +0000 (16:49 +0000)]
am
85be0c4e: Fix app ops aidl as it is also used from native.
* commit '
85be0c4e21ba6a2b74a8546403c6da03a343e5aa':
Fix app ops aidl as it is also used from native.
Ian Pedowitz [Sun, 5 Jul 2015 01:13:43 +0000 (01:13 +0000)]
Merge "Fixing log typo. s/realted/related" into mnc-dev
Ian Pedowitz [Sun, 5 Jul 2015 01:07:33 +0000 (18:07 -0700)]
Fixing log typo. s/realted/related
Bug:
22273408
Change-Id: I756f56ee80d5840bd734249826eb658cbf472921
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:
20674082,
20275572
Change-Id: I4e3448837f7c03daf00d71681ebdc96e3d8b9cc9
Neil Fuller [Sat, 4 Jul 2015 02:58:40 +0000 (02:58 +0000)]
am
93bb2bf2: am
761e39e1: Merge "Switch to using android.system.Os for more calls"
* commit '
93bb2bf2e835f714d09b53dea3ca5d9e4451021e':
Switch to using android.system.Os for more calls
Narayan Kamath [Sat, 4 Jul 2015 02:57:58 +0000 (02:57 +0000)]
am
4da086ee: am
6bcdf90e: Merge "Delete unused testing scripts and WithFramework."
* commit '
4da086ee7f4eba64265b28cdc5df9f690d97a7ac':
Delete unused testing scripts and WithFramework.
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
Svet Ganov [Fri, 3 Jul 2015 23:03:53 +0000 (16:03 -0700)]
Improve request permission docs
bug:
22252258
Change-Id: Ife19eb6b1e17b43a824379d2a039ff1c441bebdd
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
Robin Lee [Fri, 3 Jul 2015 17:09:58 +0000 (17:09 +0000)]
am
a92845cb: am
a7bdb6c9: Merge "KeyChain: annotate with @WorkerThread" into mnc-dev
* commit '
a92845cb63214370d056574d273928ea1135dbfb':
KeyChain: annotate with @WorkerThread
Robin Lee [Fri, 3 Jul 2015 16:57:39 +0000 (16:57 +0000)]
am
a7bdb6c9: Merge "KeyChain: annotate with @WorkerThread" into mnc-dev
* commit '
a7bdb6c99b7ddb6e17f9c939c138686e0bfdbbc4':
KeyChain: annotate with @WorkerThread
Robin Lee [Fri, 3 Jul 2015 16:48:11 +0000 (16:48 +0000)]
Merge "KeyChain: annotate with @WorkerThread" into mnc-dev
Neil Fuller [Fri, 3 Jul 2015 14:18:36 +0000 (14:18 +0000)]
am
761e39e1: Merge "Switch to using android.system.Os for more calls"
* commit '
761e39e18990b657c488c78a6c048f625bd6b74a':
Switch to using android.system.Os for more calls
Neil Fuller [Fri, 3 Jul 2015 14:07:33 +0000 (14:07 +0000)]
Merge "Switch to using android.system.Os for more calls"
Neil Fuller [Fri, 3 Jul 2015 09:59:17 +0000 (10:59 +0100)]
Switch to using android.system.Os for more calls
The methods being switched here should involve no important
semantic changes. socket.getSoTimeout() is now implemented:
previously it would have returned 0 in all cases.
Some tidy up of unimplemented / commented code.
Switching other calls to use Os would carry more risk and
will be handled separately they can be switched safely.
Bug:
3106438
Change-Id: I5526249395565fee6e43f159a2b5975b0d41d058
Lorenzo Colitti [Fri, 3 Jul 2015 03:02:24 +0000 (03:02 +0000)]
am
3dbb5836: am
71e3d079: Merge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev
* commit '
3dbb583649afeecbd42122fbe1115d2974da021f':
Make the VPN notice connectivity changes on stacked interfaces.
Lorenzo Colitti [Fri, 3 Jul 2015 02:49:58 +0000 (02:49 +0000)]
am
71e3d079: Merge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev
* commit '
71e3d079d623b93ec8a66afa6a1281896c7cd2c6':
Make the VPN notice connectivity changes on stacked interfaces.
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
Svet Ganov [Thu, 2 Jul 2015 22:01:07 +0000 (22:01 +0000)]
am
8018e677: am
27997678: Merge "Grant the default gallery app storage permissions" into mnc-dev
* commit '
8018e6770ad1260a481d933053ef4a84083613a1':
Grant the default gallery app storage permissions
Svetoslav [Thu, 2 Jul 2015 22:01:00 +0000 (22:01 +0000)]
am
fa656593: am
212bd428: Merge "Make granting default SMS and Phone permissions robust" into mnc-dev
* commit '
fa656593fae9ba3dea7f917da55a8667ddff5ad4':
Make granting default SMS and Phone permissions robust
Svet Ganov [Thu, 2 Jul 2015 21:47:55 +0000 (21:47 +0000)]
am
27997678: Merge "Grant the default gallery app storage permissions" into mnc-dev
* commit '
2799767886cc230d554ec7e7e9c7596b3e311e13':
Grant the default gallery app storage permissions
Svetoslav [Thu, 2 Jul 2015 21:47:49 +0000 (21:47 +0000)]
am
212bd428: Merge "Make granting default SMS and Phone permissions robust" into mnc-dev
* commit '
212bd4280de4d94efcd91e11c5169b6cf239d85a':
Make granting default SMS and Phone permissions robust
Svet Ganov [Thu, 2 Jul 2015 21:37:54 +0000 (21:37 +0000)]
Merge "Grant the default gallery app storage permissions" 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
Anthony Lee [Thu, 2 Jul 2015 19:00:09 +0000 (19:00 +0000)]
am
c692c69e: am
930d6b07: Merge "Add capability to indicate a conference will never have children." into mnc-dev
* commit '
c692c69e8a330e6dc3ca5be0da4c320751846657':
Add capability to indicate a conference will never have children.
Anthony Lee [Thu, 2 Jul 2015 18:48:48 +0000 (18:48 +0000)]
am
930d6b07: Merge "Add capability to indicate a conference will never have children." into mnc-dev
* commit '
930d6b07e32bbb0f20d9ec4f19ff08d198fa9498':
Add capability to indicate a conference will never have children.
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
Rubin Xu [Thu, 2 Jul 2015 16:46:57 +0000 (16:46 +0000)]
am
27f13d12: am
b1f4cc64: Merge "Remove ExternalMediaFormatActivity" into mnc-dev
* commit '
27f13d125f9eb8053493086871fcb5470c786264':
Remove ExternalMediaFormatActivity
Rubin Xu [Thu, 2 Jul 2015 16:31:17 +0000 (16:31 +0000)]
am
b1f4cc64: Merge "Remove ExternalMediaFormatActivity" into mnc-dev
* commit '
b1f4cc647f94a24b7918315a21c114f20c644e0b':
Remove ExternalMediaFormatActivity
Rubin Xu [Thu, 2 Jul 2015 16:22:43 +0000 (16:22 +0000)]
Merge "Remove ExternalMediaFormatActivity" into mnc-dev
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
Alex Chau [Thu, 2 Jul 2015 15:00:55 +0000 (15:00 +0000)]
am
42a18bde: am
be630760: Merge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev
* commit '
42a18bdee018dd4ec411518e10c96d8a08decefd':
Clear "profile wiped" notification when a new porfile is created
Alex Chau [Thu, 2 Jul 2015 14:47:25 +0000 (14:47 +0000)]
am
be630760: Merge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev
* commit '
be6307606e71dd2a5ce483fa876ced268fd813bf':
Clear "profile wiped" notification when a new porfile is created
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
Nicolas Prevot [Thu, 2 Jul 2015 12:54:16 +0000 (12:54 +0000)]
am
38d7050d: am
2ee3beed: Merge "In NfcActivityManager, don\'t use UserHandle.CURRENT." into mnc-dev
* commit '
38d7050da1de1e0dd98f6f5cd3bca56bfa882247':
In NfcActivityManager, don't use UserHandle.CURRENT.
Nicolas Prevot [Thu, 2 Jul 2015 12:44:02 +0000 (12:44 +0000)]
am
2ee3beed: Merge "In NfcActivityManager, don\'t use UserHandle.CURRENT." into mnc-dev
* commit '
2ee3beedb1f6702f4c94eff24c896cd4a894082b':
In NfcActivityManager, don't use UserHandle.CURRENT.
Nicolas Prevot [Thu, 2 Jul 2015 12:28:42 +0000 (12:28 +0000)]
Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev
Narayan Kamath [Thu, 2 Jul 2015 11:28:40 +0000 (11:28 +0000)]
am
6bcdf90e: Merge "Delete unused testing scripts and WithFramework."
* commit '
6bcdf90e49ca8ed1ac7a9074d5f6b79889451001':
Delete unused testing scripts and WithFramework.
Narayan Kamath [Thu, 2 Jul 2015 11:18:18 +0000 (11:18 +0000)]
Merge "Delete unused testing scripts and WithFramework."
Nicolas Prevot [Thu, 2 Jul 2015 10:52:25 +0000 (10:52 +0000)]
am
d16f1252: am
60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev
* commit '
d16f1252e1e7924a95388a5479d7bb179279f04c':
Fix the case where an intent bounces several times between users.
Narayan Kamath [Thu, 25 Jun 2015 13:22:00 +0000 (14:22 +0100)]
Delete unused testing scripts and WithFramework.
These scripts haven't worked in a long time now. run_core_test
uses VM options that aren't supported and WithFramework (which is
unmaintained) and run_junit.sh refers to an APK that doesn't
exist anymore.
If anyone wishes to run these tests individually, they can just
use vogar instead :
$ make vogar vogar.jar
$ vogar --mode=activity frameworks/base/tests/CoreTests/android/core/Sha1Test.java
This also allows us to delete the WithFramework class, which was
only referenced by these obsolete scripts.
bug:
22078684
Change-Id: I481f6721d51d50456421a1526c370b93aec9b351
Nicolas Prevot [Thu, 2 Jul 2015 10:39:46 +0000 (10:39 +0000)]
am
60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev
* commit '
60373e8060cf6de2d293a758c33cc5f610122657':
Fix the case where an intent bounces several times between users.
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
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
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
David Friedman [Thu, 2 Jul 2015 03:11:31 +0000 (03:11 +0000)]
am
b198cb02: am
00f0716a: am
2ebfc3f7: am
fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug:
20503708" into mnc-preview-docs
* commit '
b198cb029e0227e886199a13e384675b175357e0':
Docs: Localization of Design pages on DAC. Bug:
20503708