OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Calls setUidFirewallRules() and enableFirewallChain() asynchronously." into...
Felipe Leme [Fri, 9 Sep 2016 02:12:50 +0000 (02:12 +0000)]
Merge "Calls setUidFirewallRules() and enableFirewallChain() asynchronously." into nyc-mr1-dev
am: 80e32028e7

Change-Id: I6bc62e1408c7a6e2a1fa0118680ce4bb948b2e9d

7 years agoCalls setUidFirewallRules() and enableFirewallChain() asynchronously.
Felipe Leme [Fri, 9 Sep 2016 02:12:47 +0000 (02:12 +0000)]
Calls setUidFirewallRules() and enableFirewallChain() asynchronously.
am: 84d3973d85

Change-Id: Iff72b7a770f6b3a7ff7167d8d0c56547e6d657dc

7 years agoMerge "Calls setUidFirewallRules() and enableFirewallChain() asynchronously." into...
TreeHugger Robot [Fri, 9 Sep 2016 02:07:30 +0000 (02:07 +0000)]
Merge "Calls setUidFirewallRules() and enableFirewallChain() asynchronously." into nyc-mr1-dev

7 years agoMerge "Revert "Fixing issue with old tasks being visible in Overview"" into nyc-mr1-dev
Winson Chung [Fri, 9 Sep 2016 01:54:45 +0000 (01:54 +0000)]
Merge "Revert "Fixing issue with old tasks being visible in Overview"" into nyc-mr1-dev
am: 99cf874cc3

Change-Id: Ie6a26e075211c380c1ea49cff7f877e22e7bae3e

7 years agoRevert "Fixing issue with old tasks being visible in Overview"
Winson Chung [Fri, 9 Sep 2016 01:54:42 +0000 (01:54 +0000)]
Revert "Fixing issue with old tasks being visible in Overview"
am: 36f3f0337d

Change-Id: Ic89b6a3b204a6f55667df5c1459449092930d859

7 years agoMerge "Revert "Fixing issue with old tasks being visible in Overview"" into nyc-mr1-dev
Winson Chung [Fri, 9 Sep 2016 01:50:18 +0000 (01:50 +0000)]
Merge "Revert "Fixing issue with old tasks being visible in Overview"" into nyc-mr1-dev

7 years agoMerge "docs: Define card data for GPU Debugger b/31318053" into nyc-dev am: 8a7947b0d...
Cheryl Potter [Fri, 9 Sep 2016 01:34:24 +0000 (01:34 +0000)]
Merge "docs: Define card data for GPU Debugger b/31318053" into nyc-dev am: 8a7947b0d6 am: 300f7438d8
am: 9ee0772cde

Change-Id: I23dbd9223610d5572029ddb2b8051cd995ff7525

7 years agodocs: Define card data for GPU Debugger b/31318053 am: 9af802df0f am: 6b82489573
Cheryl Potter [Fri, 9 Sep 2016 01:34:19 +0000 (01:34 +0000)]
docs: Define card data for GPU Debugger b/31318053 am: 9af802df0f am: 6b82489573
am: 310a76cc40

Change-Id: I64c9a7a4d770981f71ddb74671ea252a6710740e

7 years agoRevert "Fixing issue with old tasks being visible in Overview"
Winson Chung [Thu, 8 Sep 2016 23:29:43 +0000 (23:29 +0000)]
Revert "Fixing issue with old tasks being visible in Overview"

Bug: 28908500

This reverts commit b258f6a4bd685e5efcb36c02d5817f659e10479b.

Change-Id: I9b3c04358d6ca693ed3fdcd9220af13f81eb704e

7 years agoMerge "docs: Define card data for GPU Debugger b/31318053" into nyc-dev am: 8a7947b0d6
Cheryl Potter [Fri, 9 Sep 2016 01:28:43 +0000 (01:28 +0000)]
Merge "docs: Define card data for GPU Debugger b/31318053" into nyc-dev am: 8a7947b0d6
am: 300f7438d8

Change-Id: I549ca0b589a9a31b0edd158d3287f98690bd66a9

7 years agodocs: Define card data for GPU Debugger b/31318053 am: 9af802df0f
Cheryl Potter [Fri, 9 Sep 2016 01:28:41 +0000 (01:28 +0000)]
docs: Define card data for GPU Debugger b/31318053 am: 9af802df0f
am: 6b82489573

Change-Id: I40907673e1fdfacad6197b5e4e2b0f3a3e772c4a

7 years agoMerge "docs: Define card data for GPU Debugger b/31318053" into nyc-dev
Cheryl Potter [Fri, 9 Sep 2016 01:24:04 +0000 (01:24 +0000)]
Merge "docs: Define card data for GPU Debugger b/31318053" into nyc-dev
am: 8a7947b0d6

Change-Id: I98277a55a0699b995bd71b93bcc68e914b14a576

7 years agodocs: Define card data for GPU Debugger b/31318053
Cheryl Potter [Fri, 9 Sep 2016 01:23:57 +0000 (01:23 +0000)]
docs: Define card data for GPU Debugger b/31318053
am: 9af802df0f

Change-Id: Iccbf477340c50283660c0eed32decd4587e56154

7 years agoMerge "docs: Define card data for GPU Debugger b/31318053" into nyc-dev
Cheryl Potter [Fri, 9 Sep 2016 01:15:52 +0000 (01:15 +0000)]
Merge "docs: Define card data for GPU Debugger b/31318053" into nyc-dev

7 years agoMerge "ContextHubService: Keep handles across hub reboot" into nyc-mr1-dev
Greg Kaiser [Fri, 9 Sep 2016 00:31:09 +0000 (00:31 +0000)]
Merge "ContextHubService: Keep handles across hub reboot" into nyc-mr1-dev
am: 8e91087c3a

Change-Id: I19a98795ccfbf09e464f4332844189ded0982090

7 years agoContextHubService: Keep handles across hub reboot
Greg Kaiser [Fri, 9 Sep 2016 00:31:07 +0000 (00:31 +0000)]
ContextHubService: Keep handles across hub reboot
am: f16abd98c7

Change-Id: I0ea7941db8ba248a278dc505e9057edf7a7b199c

7 years agoMerge "ContextHubService: Keep handles across hub reboot" into nyc-mr1-dev
Greg Kaiser [Fri, 9 Sep 2016 00:18:56 +0000 (00:18 +0000)]
Merge "ContextHubService: Keep handles across hub reboot" into nyc-mr1-dev

7 years agoMerge "[DO NOT MERGE] Remove toast window immediately" into nyc-mr1-dev
Svetoslav Ganov [Thu, 8 Sep 2016 23:56:11 +0000 (23:56 +0000)]
Merge "[DO NOT MERGE] Remove toast window immediately" into nyc-mr1-dev
am: 821dd78512

Change-Id: I58faf8f6ef0fbe1d1ae7d8c6461655b518faabfb

7 years ago[DO NOT MERGE] Remove toast window immediately
Svet Ganov [Thu, 8 Sep 2016 23:56:07 +0000 (23:56 +0000)]
[DO NOT MERGE] Remove toast window immediately
am: 6367e4ed30

Change-Id: Ie3fa91540cf941aa5156597899c0b5dff37ec87e

7 years agoMerge "[DO NOT MERGE] Remove toast window immediately" into nyc-mr1-dev
Svetoslav Ganov [Thu, 8 Sep 2016 23:49:35 +0000 (23:49 +0000)]
Merge "[DO NOT MERGE] Remove toast window immediately" into nyc-mr1-dev

7 years agoMerge "Don't update app idle rules on updateRulesForRestrictPowerUL()." into nyc...
Felipe Leme [Thu, 8 Sep 2016 23:27:36 +0000 (23:27 +0000)]
Merge "Don't update app idle rules on updateRulesForRestrictPowerUL()." into nyc-mr1-dev
am: abf1e82594

Change-Id: Ia9c975a556ff2ccb96bb58076b336a1479cf980f

7 years agoDon't update app idle rules on updateRulesForRestrictPowerUL().
Felipe Leme [Thu, 8 Sep 2016 23:27:33 +0000 (23:27 +0000)]
Don't update app idle rules on updateRulesForRestrictPowerUL().
am: 0970046adf

Change-Id: I59d5daec570117f53e31837b61d8bb2886d35780

7 years agoMerge "Don't update app idle rules on updateRulesForRestrictPowerUL()." into nyc...
TreeHugger Robot [Thu, 8 Sep 2016 23:17:46 +0000 (23:17 +0000)]
Merge "Don't update app idle rules on updateRulesForRestrictPowerUL()." into nyc-mr1-dev

7 years ago[DO NOT MERGE] Remove toast window immediately
Svet Ganov [Thu, 8 Sep 2016 14:11:52 +0000 (07:11 -0700)]
[DO NOT MERGE] Remove toast window immediately

To address a security issue where a toast window can be
used by an app to overlay other apps without a permission
we now allow legacy apps to be able to put at most one
toast window on the screen to prevent adding the same
window over and over again to go around the new restriction
that toast windows are always removed after a timeout.
This change ensures that Toast removes its window immediately.

bug:31340854

Change-Id: Ia7f90844eb64b583321103d090e4407038b41547
(cherry picked from commit 1777c91f8f700c106290744b3f3465f8220c474f)

7 years agoMerge "KeyguardStatusBar: Fix bad state after canceled animation" into nyc-mr1-dev
Adrian Roos [Thu, 8 Sep 2016 21:37:01 +0000 (21:37 +0000)]
Merge "KeyguardStatusBar: Fix bad state after canceled animation" into nyc-mr1-dev
am: cbed5a74a4

Change-Id: I82ed07990a4bdf635594a544881e560579f907c1

7 years agoKeyguardStatusBar: Fix bad state after canceled animation
Adrian Roos [Thu, 8 Sep 2016 21:36:58 +0000 (21:36 +0000)]
KeyguardStatusBar: Fix bad state after canceled animation
am: e2f6173bc0

Change-Id: I44e0e89f4d8eed0729b1450e44e57cb53dc97d1f

7 years agoMerge "KeyguardStatusBar: Fix bad state after canceled animation" into nyc-mr1-dev
TreeHugger Robot [Thu, 8 Sep 2016 21:31:51 +0000 (21:31 +0000)]
Merge "KeyguardStatusBar: Fix bad state after canceled animation" into nyc-mr1-dev

7 years agoMerge "Remove the deleted userhanle in cache to stop crashing." into nyc-mr1-dev
Lei Yu [Thu, 8 Sep 2016 21:18:18 +0000 (21:18 +0000)]
Merge "Remove the deleted userhanle in cache to stop crashing." into nyc-mr1-dev
am: b1f01b752a

Change-Id: I4c7c358d25ff3c8cafe5f02ad834a656ab3b5483

7 years agoRemove the deleted userhanle in cache to stop crashing.
jackqdyulei [Thu, 8 Sep 2016 21:18:16 +0000 (21:18 +0000)]
Remove the deleted userhanle in cache to stop crashing.
am: dfc6ce5d95

Change-Id: I7e5fbc5721ba72942d5c1e12ed54149b7612355e

7 years agoMerge "Remove the deleted userhanle in cache to stop crashing." into nyc-mr1-dev
Lei Yu [Thu, 8 Sep 2016 21:14:25 +0000 (21:14 +0000)]
Merge "Remove the deleted userhanle in cache to stop crashing." into nyc-mr1-dev

7 years agoMerge "Change density for the correct user" into nyc-mr1-dev
Alan Viverette [Thu, 8 Sep 2016 21:13:54 +0000 (21:13 +0000)]
Merge "Change density for the correct user" into nyc-mr1-dev
am: c779cdc560

Change-Id: I2313840488468b28b015b859ee3d20848128dd04

7 years agoChange density for the correct user
Alan Viverette [Thu, 8 Sep 2016 21:13:39 +0000 (21:13 +0000)]
Change density for the correct user
am: df3a7cab8f

Change-Id: I4f4dfaa8f9035cdd4939d1d40e66ebac51811f73

7 years agoContextHubService: Keep handles across hub reboot
Greg Kaiser [Thu, 8 Sep 2016 07:12:19 +0000 (00:12 -0700)]
ContextHubService: Keep handles across hub reboot

Previously, when a Context Hub rebooted, this service would reset
all of the "handles" used to identify the nanoapps on the Context
Hub.  This caused many issues for Java application code trying to
track nanoapps, and these issues were exacerbated under nanohub,
which reboots every times it loads an app.

We change this so that we keep the same handle across reboot if
the same nanoapp is still running post-reboot.  We accomplish
this by never "invalidating" our caches, but rather performing
a query post-reboot and removing stale entries.

Due to b/30835598, we needed to change our post-load query to
be all apps.  Without that change, a race between the two
query responses we would have post nanohub app load (one for
post-load, one for post-reboot) would leave us without knowing
which response we're dealing with.  Now, since both requests
are the same, we don't care which response we deal with.

This is all (hopefully) just for the Nougat release.  In the
O release, we hope to remove these caches (b/30835981) and
the idea of the JNI code inventing handles (b/30810861).

Bug: 30950975
Change-Id: I85a84ba5c1a039d69c1adaaea56609e0a38cce42

7 years agoMerge "Change density for the correct user" into nyc-mr1-dev
TreeHugger Robot [Thu, 8 Sep 2016 21:06:58 +0000 (21:06 +0000)]
Merge "Change density for the correct user" into nyc-mr1-dev

7 years agoCalls setUidFirewallRules() and enableFirewallChain() asynchronously.
Felipe Leme [Thu, 8 Sep 2016 20:26:55 +0000 (13:26 -0700)]
Calls setUidFirewallRules() and enableFirewallChain() asynchronously.

The updateRulesForRestrictPowerUL() method is used to set the
power-related restrictions for all apps and it ends up by calling
NetworkManagerService twice (and each call spawns an iptables process,
which takes ~50ms to complete). This method is called on some critical
paths, like when the device leaves Doze Light mode.

This change makes these calls asynchronously, hence reducing the delay
on such critical paths in the O(100ms).

Fixes: 31281543

Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t
com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: If720a7112c72a18193ea9614ae187b7ed9c741ec

7 years agoMerge "Changed the header of the region selection list to "All regions"" into nyc...
Mihai Niță [Thu, 8 Sep 2016 20:54:47 +0000 (20:54 +0000)]
Merge "Changed the header of the region selection list to "All regions"" into nyc-mr1-dev
am: a0ace71899

Change-Id: I4b600c91717b44c2ef3f93d2867c94f4550e2989

7 years agoChanged the header of the region selection list to "All regions"
Mihai Nita [Thu, 8 Sep 2016 20:54:43 +0000 (20:54 +0000)]
Changed the header of the region selection list to "All regions"
am: 543e45babe

Change-Id: I7e42e404d7021094376104119f7568fe1838e489

7 years agoMerge "Changed the header of the region selection list to "All regions"" into nyc...
Mihai Niță [Thu, 8 Sep 2016 20:48:11 +0000 (20:48 +0000)]
Merge "Changed the header of the region selection list to "All regions"" into nyc-mr1-dev

7 years agoMerge "ContextHubService: Avoid null pointer dereference" into nyc-mr1-dev
Greg Kaiser [Thu, 8 Sep 2016 20:45:52 +0000 (20:45 +0000)]
Merge "ContextHubService: Avoid null pointer dereference" into nyc-mr1-dev
am: a630b2d667

Change-Id: I77fab1beead68551d5a69b0f46275e515c4eabc5

7 years agoContextHubService: Avoid null pointer dereference
Greg Kaiser [Thu, 8 Sep 2016 20:45:49 +0000 (20:45 +0000)]
ContextHubService: Avoid null pointer dereference
am: ca9c676099

Change-Id: I4350cbc3c232e356ea97ff4be8ab4667516a309d

7 years agoMerge "ContextHubService: Avoid null pointer dereference" into nyc-mr1-dev
Greg Kaiser [Thu, 8 Sep 2016 20:40:58 +0000 (20:40 +0000)]
Merge "ContextHubService: Avoid null pointer dereference" into nyc-mr1-dev

7 years agoMerge "Fix hint text color to align with latest Material spec" into nyc-mr1-dev
Alan Viverette [Thu, 8 Sep 2016 20:05:26 +0000 (20:05 +0000)]
Merge "Fix hint text color to align with latest Material spec" into nyc-mr1-dev
am: e00fe59837

Change-Id: Ibbb1fa18f256b2df7dfe79a0ed8add57b5814eb1

7 years agoFix hint text color to align with latest Material spec
Alan Viverette [Thu, 8 Sep 2016 20:05:22 +0000 (20:05 +0000)]
Fix hint text color to align with latest Material spec
am: 6ae673caf4

Change-Id: I10605045805e294d4a5cf912176c8b26bf63724c

7 years agoMerge "Fix hint text color to align with latest Material spec" into nyc-mr1-dev
Alan Viverette [Thu, 8 Sep 2016 20:00:32 +0000 (20:00 +0000)]
Merge "Fix hint text color to align with latest Material spec" into nyc-mr1-dev

7 years agoDon't update app idle rules on updateRulesForRestrictPowerUL().
Felipe Leme [Thu, 8 Sep 2016 16:33:48 +0000 (09:33 -0700)]
Don't update app idle rules on updateRulesForRestrictPowerUL().

updateRulesForRestrictPowerUL() should only affect the global
rules (Doze and Battery Saver), while app idle is an app-specific
rule. Such call was delaying setDeviceIdle() in O(100ms).

BUG: 31281543

Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleNonMetered_enabled
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleNonMetered_whitelisted
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleNonMetered_blacklisted
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleMetered_enabled
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleMetered_whitelisted
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleMetered_disabled

Change-Id: I32ad6853a6d88e2709538d00cd1e77b96d331b2d

7 years agoMerge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev am:...
Andrew Solovay [Thu, 8 Sep 2016 18:07:05 +0000 (18:07 +0000)]
Merge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev am: de40f9d677 am: 6cff52dbae
am: 8c83edc43b

Change-Id: Ib3adb38bf42c48e890b738a6a8527953fc45aa25

7 years agoChanged the header of the region selection list to "All regions"
Mihai Nita [Fri, 2 Sep 2016 17:36:59 +0000 (10:36 -0700)]
Changed the header of the region selection list to "All regions"

Bug: 31257462
Change-Id: I3112b5700e23674d2c48c7ca96a2f1a17a5f15db

7 years agodocs: Fixing links to moved Fragments guide, + redirect am: f53968061c am: 37b32a5d31
Andrew Solovay [Thu, 8 Sep 2016 18:00:13 +0000 (18:00 +0000)]
docs: Fixing links to moved Fragments guide, + redirect am: f53968061c am: 37b32a5d31
am: ae09fcad26

Change-Id: I3a799ca9c4155eb62c660718b849df35aa234603

7 years agoMerge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev am:...
Andrew Solovay [Thu, 8 Sep 2016 17:55:51 +0000 (17:55 +0000)]
Merge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev am: de40f9d677
am: 6cff52dbae

Change-Id: Ida064a9e8fd3498f2df2f5843c94ecd53653124a

7 years agodocs: Fixing links to moved Fragments guide, + redirect am: f53968061c
Andrew Solovay [Thu, 8 Sep 2016 17:50:36 +0000 (17:50 +0000)]
docs: Fixing links to moved Fragments guide, + redirect am: f53968061c
am: 37b32a5d31

Change-Id: Iedccf6e09180096235f438edb96bdf73e273fae0

7 years agoMerge "Fix memory leak in MediaScannerConnection" into nyc-mr1-dev
Marco Nelissen [Thu, 8 Sep 2016 17:43:52 +0000 (17:43 +0000)]
Merge "Fix memory leak in MediaScannerConnection" into nyc-mr1-dev
am: 1f65a69d9a

Change-Id: I95be785b4f5f93b49125b4ae68547f1f26d82d1d

7 years agoFix memory leak in MediaScannerConnection
xiaoli.xb.zuo [Thu, 8 Sep 2016 17:43:49 +0000 (17:43 +0000)]
Fix memory leak in MediaScannerConnection
am: 439e5e49fb

Change-Id: I0ec325ca19d892d9280563fcd6a7343fafcf18c4

7 years agoMerge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev
Andrew Solovay [Thu, 8 Sep 2016 17:43:45 +0000 (17:43 +0000)]
Merge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev
am: de40f9d677

Change-Id: Ib6be573fb963eda1d032c55eb9da4878d7374533

7 years agodocs: Fixing links to moved Fragments guide, + redirect
Andrew Solovay [Thu, 8 Sep 2016 17:43:40 +0000 (17:43 +0000)]
docs: Fixing links to moved Fragments guide, + redirect
am: f53968061c

Change-Id: Ic29b29244d2919bcd5eb5b72daeaa8a78dc71e2d

7 years agoMerge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev
Andrew Solovay [Thu, 8 Sep 2016 17:36:46 +0000 (17:36 +0000)]
Merge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev

7 years agoMerge "Fix memory leak in MediaScannerConnection" into nyc-mr1-dev
Marco Nelissen [Thu, 8 Sep 2016 17:34:16 +0000 (17:34 +0000)]
Merge "Fix memory leak in MediaScannerConnection" into nyc-mr1-dev

7 years agoMerge "DO NOT MERGE: Accurately emulate historic Downloads ACTION_VIEW behavior....
Steve McKay [Thu, 8 Sep 2016 17:31:14 +0000 (17:31 +0000)]
Merge "DO NOT MERGE: Accurately emulate historic Downloads ACTION_VIEW behavior." into nyc-mr1-dev
am: 466d359330

Change-Id: I1b1e09395c7db6e9f6364962b52c4425f09b89a3

7 years agoDO NOT MERGE: Accurately emulate historic Downloads ACTION_VIEW behavior.
Steve McKay [Thu, 8 Sep 2016 17:31:12 +0000 (17:31 +0000)]
DO NOT MERGE: Accurately emulate historic Downloads ACTION_VIEW behavior.
am: 3f5885918b

Change-Id: Ibe8c67367649ecc5a229b86592257b976ba2411d

7 years agoMerge "DO NOT MERGE: Accurately emulate historic Downloads ACTION_VIEW behavior....
TreeHugger Robot [Thu, 8 Sep 2016 17:25:16 +0000 (17:25 +0000)]
Merge "DO NOT MERGE: Accurately emulate historic Downloads ACTION_VIEW behavior." into nyc-mr1-dev

7 years agoRemove the deleted userhanle in cache to stop crashing.
jackqdyulei [Wed, 24 Aug 2016 16:48:54 +0000 (09:48 -0700)]
Remove the deleted userhanle in cache to stop crashing.

Because the user handles are not up-to-date, we need to update it when
necessary.

Bug: 30919785
Test: This branch doesn't support robo test, testcases will be added in
master branch when merged down(ag/1419729)

Change-Id: Ia095c3946c49db239e0b1b2bcc8588b02158c036

7 years agoFix memory leak in MediaScannerConnection
xiaoli.xb.zuo [Wed, 13 Jul 2016 05:37:58 +0000 (14:37 +0900)]
Fix memory leak in MediaScannerConnection

This patch adds releasing of MediaScannerConnection in ClientProxy
after disconnecting and releasing of ClientProxy and
IMediaScannerService in disconnection sequence in
MediaScannerConnection.

Bug: 30150344

Change-Id: I1e162e4c9a0b7a741ace20480bcf06f3151a93bf

7 years agoMerge "Update icons and strings for always-on VPN info" into nyc-mr1-dev
Robin Lee [Thu, 8 Sep 2016 10:58:41 +0000 (10:58 +0000)]
Merge "Update icons and strings for always-on VPN info" into nyc-mr1-dev
am: 6c99793491

Change-Id: I6e97cbef6612312029060a3182d4697839b0d651

7 years agoUpdate icons and strings for always-on VPN info
Robin Lee [Thu, 8 Sep 2016 10:58:33 +0000 (10:58 +0000)]
Update icons and strings for always-on VPN info
am: 63d7c8d86d

Change-Id: I2865e3606f8631fe5448fad51d7e2d673879c0c8

7 years agoMerge "Update icons and strings for always-on VPN info" into nyc-mr1-dev
TreeHugger Robot [Thu, 8 Sep 2016 10:52:17 +0000 (10:52 +0000)]
Merge "Update icons and strings for always-on VPN info" into nyc-mr1-dev

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev...
Narayan Kamath [Thu, 8 Sep 2016 09:26:08 +0000 (09:26 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a am: 177ee386b9 am: b126d7c7c5 am: f04f3892fb
am: a0abd73bc9

Change-Id: I53d4ab6584331ab1dd08c6a353a4df17a528604a

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev...
Narayan Kamath [Thu, 8 Sep 2016 09:21:44 +0000 (09:21 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a am: 177ee386b9 am: b126d7c7c5
am: f04f3892fb

Change-Id: I1bfdbef0c8df640d64cdb77cdccc51d38bb75186

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours...
Narayan Kamath [Thu, 8 Sep 2016 09:18:21 +0000 (09:18 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560  -s ours am: 6fa8339792 am: c6ced086d1 am: 4474da7b7c am: 5556367bc1 am: 7f78990260
am: cdc2842cfc

Change-Id: Id88c4df8db55fb506b7b40ebaaa2597df6cb0011

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev...
Narayan Kamath [Thu, 8 Sep 2016 09:18:14 +0000 (09:18 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 am: 7a0c7ab520 am: 45d7b8dd2a am: c83ca7267a
am: edabef5738

Change-Id: I5e29bcc852b8c3e361ad0c3ba872e8d959ef5717

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev...
Narayan Kamath [Thu, 8 Sep 2016 09:16:24 +0000 (09:16 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a am: 177ee386b9
am: b126d7c7c5

Change-Id: Ibd4f7188bf500886e53d4b714e5c7de1ad5b10c0

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours...
Narayan Kamath [Thu, 8 Sep 2016 09:06:22 +0000 (09:06 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560  -s ours am: 6fa8339792 am: c6ced086d1 am: 4474da7b7c am: 5556367bc1
am: 7f78990260

Change-Id: I6a6be5e38a99806f68bf33a2642a79d39f14d3b3

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev...
Narayan Kamath [Thu, 8 Sep 2016 09:06:19 +0000 (09:06 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 am: 7a0c7ab520 am: 45d7b8dd2a
am: c83ca7267a

Change-Id: I3ec8374998a606b98d61a2e6de72b1be2800a4c8

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 41ca1bce01 am: 49d992...
Narayan Kamath [Thu, 8 Sep 2016 09:05:29 +0000 (09:05 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 41ca1bce01 am: 49d992fdb0 am: 67c4adb5c1  -s ours am: bf16d345a6 am: beade90fe3
am: 6f98f1ac62

Change-Id: Ic39bf6e7c1b5cc11dc4fbdea505371ae814aa3f2

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev...
Narayan Kamath [Thu, 8 Sep 2016 09:05:08 +0000 (09:05 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a
am: 177ee386b9

Change-Id: Ic7a1d8c1ba996024b02915e431f2b7aacc306225

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours...
Narayan Kamath [Thu, 8 Sep 2016 08:57:48 +0000 (08:57 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560  -s ours am: 6fa8339792 am: c6ced086d1 am: 4474da7b7c
am: 5556367bc1

Change-Id: I5db1d9538c274cf6d5e9a001ba7d38056f3928eb

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev...
Narayan Kamath [Thu, 8 Sep 2016 08:57:46 +0000 (08:57 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 am: 7a0c7ab520
am: 45d7b8dd2a

Change-Id: I66a02ec7bac220d515fc623dbcd0688b72db37fb

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 41ca1bce01 am: 49d992...
Narayan Kamath [Thu, 8 Sep 2016 08:57:35 +0000 (08:57 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 41ca1bce01 am: 49d992fdb0 am: 67c4adb5c1  -s ours am: bf16d345a6
am: beade90fe3

Change-Id: I17a42a46943a47015a94f31d9e4298ec2162fa29

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 41ca1bce01 am: 49d992...
Narayan Kamath [Thu, 8 Sep 2016 08:49:59 +0000 (08:49 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 41ca1bce01 am: 49d992fdb0 am: 67c4adb5c1  -s ours
am: bf16d345a6

Change-Id: Iedb9a7c7428cd8a5dc5aabaf9f1f88d96c8f022a

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours...
Narayan Kamath [Thu, 8 Sep 2016 08:48:39 +0000 (08:48 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560  -s ours am: 6fa8339792 am: c6ced086d1
am: 4474da7b7c

Change-Id: Ie14b0e7887bd2da5c986b077f4563bbc306c88be

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev...
Narayan Kamath [Thu, 8 Sep 2016 08:48:31 +0000 (08:48 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6
am: 7a0c7ab520

Change-Id: I0ed385ab13ca461c1b77226d3be3cf788a09d3d6

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev...
Narayan Kamath [Thu, 8 Sep 2016 08:45:47 +0000 (08:45 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1
am: 71e6a6f12a

Change-Id: Ib162897a1428ab8c025a414eb0a3872327274f7a

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 41ca1bce01 am: 49d992fdb0
Narayan Kamath [Thu, 8 Sep 2016 08:44:31 +0000 (08:44 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 41ca1bce01 am: 49d992fdb0
am: 67c4adb5c1  -s ours

Change-Id: I2af50f6d32be035f491df4a0b83489ba7da186e7

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev...
Narayan Kamath [Thu, 8 Sep 2016 08:40:03 +0000 (08:40 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32
am: 447d3798f1

Change-Id: I323c669ed44e10f9e3a91271f47800754da5d389

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours...
Narayan Kamath [Thu, 8 Sep 2016 08:39:07 +0000 (08:39 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560  -s ours am: 6fa8339792
am: c6ced086d1

Change-Id: Ie3699efd33fe53acfd0dff64cbb18e4792a65bf3

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev...
Narayan Kamath [Thu, 8 Sep 2016 08:35:04 +0000 (08:35 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7
am: 47b88a15f6

Change-Id: Id267e22508824d569f54068291304584b3343b9a

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 41ca1bce01
Narayan Kamath [Thu, 8 Sep 2016 08:34:58 +0000 (08:34 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 41ca1bce01
am: 49d992fdb0

Change-Id: I0560d831235bd7ba3ea764b23e64b4e08110d7e5

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours
Narayan Kamath [Thu, 8 Sep 2016 08:33:40 +0000 (08:33 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560  -s ours
am: 6fa8339792

Change-Id: Id7ad55a251a26782815005218dc186b53e74cfca

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev
Narayan Kamath [Thu, 8 Sep 2016 08:30:41 +0000 (08:30 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev
am: 014016cf32

Change-Id: Ic0cf8b5cc2accaad552b82eaadce359e21e5e624

7 years agoMerge "Fix incorrect notification about running out of storage space." into nyc-mr1-dev
Richard Uhler [Thu, 8 Sep 2016 08:25:09 +0000 (08:25 +0000)]
Merge "Fix incorrect notification about running out of storage space." into nyc-mr1-dev
am: dd7ff22325

Change-Id: I9f51b631fec9cf1e6f67e0a4a5028749fbc9e9ee

7 years agoFix incorrect notification about running out of storage space.
Richard Uhler [Thu, 8 Sep 2016 08:25:03 +0000 (08:25 +0000)]
Fix incorrect notification about running out of storage space.
am: d42fe85bc9

Change-Id: I00a67219e4d7ce8b531dde57073d563dca1ad73e

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev
Narayan Kamath [Thu, 8 Sep 2016 08:24:54 +0000 (08:24 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev
am: 459810b9b7

Change-Id: I867a7c97c8363ede1b04e4ea8a75045d36d9d58d

7 years agoBackport changes to whitelist sockets opened by the zygote.
Narayan Kamath [Thu, 8 Sep 2016 08:24:47 +0000 (08:24 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am: 41ca1bce01

Change-Id: Id08676457fa3fa022d607e5de754f49b9c396261

7 years agoBackport changes to whitelist sockets opened by the zygote.
Narayan Kamath [Thu, 8 Sep 2016 08:23:49 +0000 (08:23 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am: 0f6a0e1560  -s ours

Change-Id: I2cdd131b750b4d04672149dcf7a90d2d566dd621

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev
Narayan Kamath [Thu, 8 Sep 2016 08:20:55 +0000 (08:20 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev

7 years agoMerge "Fix incorrect notification about running out of storage space." into nyc-mr1-dev
TreeHugger Robot [Thu, 8 Sep 2016 08:17:48 +0000 (08:17 +0000)]
Merge "Fix incorrect notification about running out of storage space." into nyc-mr1-dev

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev
Narayan Kamath [Thu, 8 Sep 2016 08:12:17 +0000 (08:12 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev...
Narayan Kamath [Thu, 8 Sep 2016 07:57:51 +0000 (07:57 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab539368 am: d18881d4f8
am: c60f54edfb

Change-Id: Ifeda9eb2d6daf0a814fe10c677e3cf88fce17cab

7 years agoBackport changes to whitelist sockets opened by the zygote. am: a1252ccbdb am: abd5b0...
Narayan Kamath [Thu, 8 Sep 2016 07:57:49 +0000 (07:57 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: a1252ccbdb am: abd5b05190  -s ours
am: 96eb99506b

Change-Id: If65507590e8802187214184b59d083720943651f

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev...
Narayan Kamath [Thu, 8 Sep 2016 07:52:59 +0000 (07:52 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab539368
am: d18881d4f8

Change-Id: Id755f9a0a2854f874f852eddeaf129e59bb15838

7 years agoBackport changes to whitelist sockets opened by the zygote. am: a1252ccbdb
Narayan Kamath [Thu, 8 Sep 2016 07:52:57 +0000 (07:52 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: a1252ccbdb
am: abd5b05190  -s ours

Change-Id: I372ab503a353175ff9e7ed49e8c775481f173bd8

7 years agoMerge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev
Narayan Kamath [Thu, 8 Sep 2016 07:47:24 +0000 (07:47 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev
am: 15ab539368

Change-Id: I88c0fde563218de25fb0fa9a6bd29abf0df44212