OSDN Git Service

android-x86/frameworks-base.git
9 years agoam a72eac60: Fix a typo causing NPE in restricted profiles
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

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 agoam 401aa9d8: Merge "Clean up Hyphenator file reading" into mnc-dev
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

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 agoam 10c111ed: Merge "Show basic feature warning for default granted permissions" into...
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

9 years agoam cb8d2e21: Merge "Improve request permission docs" into mnc-dev
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

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 agoam 7fe86c47: Merge "Fix docs for ViewAnimationUtils.createCircularReveal" 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

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 agoam a5595900: (-s ours) Merge "Import translations. DO NOT MERGE" 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

9 years agoam 210b38d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
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

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 agoam b0819373: (-s ours) 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

9 years agoam 88b4a0ac: (-s ours) 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

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 agoam b0b3d0bc: Fix two parsing bugs in new DHCP client.
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.

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 agoam 738a8dfc: Merge "Fixing log typo. s/realted/related" into mnc-dev
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

9 years agoam 85be0c4e: Fix app ops aidl as it is also used from native.
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.

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 agoam 93bb2bf2: am 761e39e1: Merge "Switch to using android.system.Os for more calls"
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

9 years agoam 4da086ee: am 6bcdf90e: Merge "Delete unused testing scripts and WithFramework."
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.

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 agoam a92845cb: am a7bdb6c9: Merge "KeyChain: annotate with @WorkerThread" into mnc-dev
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

9 years agoam a7bdb6c9: Merge "KeyChain: annotate with @WorkerThread" into mnc-dev
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

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 agoam 761e39e1: Merge "Switch to using android.system.Os for more calls"
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

9 years agoMerge "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"

9 years agoSwitch 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

9 years agoam 3dbb5836: am 71e3d079: Merge "Make the VPN notice connectivity changes on stacked...
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.

9 years agoam 71e3d079: Merge "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.

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 agoam 8018e677: am 27997678: Merge "Grant the default gallery app storage permissions...
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

9 years agoam fa656593: am 212bd428: Merge "Make granting default SMS and Phone 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

9 years agoam 27997678: Merge "Grant the default gallery app storage permissions" into mnc-dev
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

9 years agoam 212bd428: Merge "Make granting default SMS and Phone permissions robust" into...
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

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 agoam c692c69e: am 930d6b07: Merge "Add capability to indicate a conference will never...
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.

9 years agoam 930d6b07: Merge "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.

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 agoam 27f13d12: am b1f4cc64: Merge "Remove ExternalMediaFormatActivity" 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

9 years agoam b1f4cc64: Merge "Remove ExternalMediaFormatActivity" into mnc-dev
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

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 agoam 42a18bde: am be630760: Merge "Clear "profile wiped" notification when a new porfil...
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

9 years agoam be630760: Merge "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

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 agoam 38d7050d: am 2ee3beed: Merge "In NfcActivityManager, don\'t use UserHandle.CURRENT...
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.

9 years agoam 2ee3beed: Merge "In NfcActivityManager, don\'t use UserHandle.CURRENT." into mnc-dev
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.

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 agoam 6bcdf90e: Merge "Delete unused testing scripts and WithFramework."
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.

9 years agoMerge "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."

9 years agoam d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times...
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.

9 years agoDelete unused testing scripts and WithFramework.
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

9 years agoam 60373e80: Merge "Fix the case where an intent bounces several times between users...
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.

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 agoam b198cb02: am 00f0716a: am 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of...
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

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

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

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 00f0716a: am 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages...
David Friedman [Thu, 2 Jul 2015 02:57:41 +0000 (02:57 +0000)]
am 00f0716a: am 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs

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

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

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

9 years agoam 7099e39f: am 8fbe1a0c: Merge "Add accessibility actions for the PROCESS_TEXT featu...
Abodunrinwa Toki [Thu, 2 Jul 2015 02:51:33 +0000 (02:51 +0000)]
am 7099e39f: am 8fbe1a0c: Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev

* commit '7099e39f142ff67327ae1a242039fc5f98b76717':
  Add accessibility actions for the PROCESS_TEXT feature.

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 ee548960: am b29d573d: am b85962df: am e155eef4: am 2735ac71: am 22cd16a0: am...
Wale Ogunwale [Thu, 2 Jul 2015 02:39:23 +0000 (02:39 +0000)]
am ee548960: am b29d573d: 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 'ee5489606e85d3baae5dba4aeef125cd00fd3dec':
  Prevent system uid component from running in an app process

9 years agoam 8fbe1a0c: Merge "Add accessibility actions for the PROCESS_TEXT feature." into...
Abodunrinwa Toki [Thu, 2 Jul 2015 02:38:52 +0000 (02:38 +0000)]
am 8fbe1a0c: Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev

* commit '8fbe1a0cfc0354067c10e5e788519c19f4b39349':
  Add accessibility actions for the PROCESS_TEXT feature.

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 agoam b29d573d: am b85962df: am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am...
Wale Ogunwale [Thu, 2 Jul 2015 02:25:46 +0000 (02:25 +0000)]
am b29d573d: 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 'b29d573dda8f615447bdfbddd0a3e72aa78c2775':
  Prevent system uid component from running in an app process

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 577dd7e0: am d9de45ad: am 2adcfa1c: am 657d20ee: am 44000724: am 5278cea1: am...
Wale Ogunwale [Thu, 2 Jul 2015 01:29:00 +0000 (01:29 +0000)]
am 577dd7e0: am d9de45ad: 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 '577dd7e0c60fc9746ed8f092b5445e92f66f5e38':
  Prevent system uid component from running in an app process

9 years agoam d91dbca3: am 2f8cac6b: am 655b08c3: am b6f87997: am f54d1722: am 52034328: am...
Wale Ogunwale [Thu, 2 Jul 2015 01:28:54 +0000 (01:28 +0000)]
am d91dbca3: am 2f8cac6b: 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 'd91dbca3dab649283d5024534f1b7d27c4aa7535':
  Prevent system uid component from running in an app process

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

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

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 d9de45ad: am 2adcfa1c: am 657d20ee: am 44000724: am 5278cea1: am d72dc762: am...
Wale Ogunwale [Thu, 2 Jul 2015 01:15:57 +0000 (01:15 +0000)]
am d9de45ad: 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 'd9de45ad0e7073ef27074c0d1d4310c736a521aa':
  Prevent system uid component from running in an app process

9 years agoam 2f8cac6b: am 655b08c3: am b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge...
Wale Ogunwale [Thu, 2 Jul 2015 01:15:51 +0000 (01:15 +0000)]
am 2f8cac6b: 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 '2f8cac6b4c1c2035c63eb3c9dd5e9fa95a5b4cbc':
  Prevent system uid component from running in an app process

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

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

9 years agoam df01b76c: am fcf9eb76: am 429b9afd: am 0de59080: Merge "Docs: Fixes metadata that...
David Friedman [Thu, 2 Jul 2015 01:15:20 +0000 (01:15 +0000)]
am df01b76c: am fcf9eb76: am 429b9afd: am 0de59080: Merge "Docs: Fixes metadata that was getting mangled in jd_lists_unified file." into mnc-preview-docs

* commit 'df01b76c051839a1ed50f4661c74002bf1905e02':
  Docs: Fixes metadata that was getting mangled in jd_lists_unified file.

9 years agoam fbf1579a: am 0d3a0f1b: am c5764868: am e562bb6b: Merge "Docs: Localizations of...
David Friedman [Thu, 2 Jul 2015 01:15:14 +0000 (01:15 +0000)]
am fbf1579a: am 0d3a0f1b: am c5764868: am e562bb6b: Merge "Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574" into mnc-preview-docs

* commit 'fbf1579a0b9e8ad475aea72e2b2c119093c05ba9':
  Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574

9 years agoam 1d0fa27f: am 6da7931e: am 5320bccf: am 16add46c: Docs: Adding localized TOC for...
David Friedman [Thu, 2 Jul 2015 01:15:08 +0000 (01:15 +0000)]
am 1d0fa27f: am 6da7931e: am 5320bccf: am 16add46c: Docs: Adding localized TOC for Preview docs.

* commit '1d0fa27fb06b2298190f61ec4b5e424f63bd0be7':
  Docs: Adding localized TOC for Preview docs.

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 0bee30c7: am e4c7c51d: am bf0fd65c: am 9131f97f: Merge "docs: Added warning to...
Robert Schaub [Thu, 2 Jul 2015 01:02:28 +0000 (01:02 +0000)]
am 0bee30c7: am e4c7c51d: am bf0fd65c: am 9131f97f: Merge "docs: Added warning to not use Android Key when API key is required" into mnc-preview-docs

* commit '0bee30c717c9261434b034fa62f27cd5b2d7d270':
  docs: Added warning to not use Android Key when API key is required