OSDN Git Service
Felipe Leme [Thu, 18 Aug 2016 22:31:45 +0000 (15:31 -0700)]
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
Most tests were failing because due to a null NetworkCapabilities.
Example:
1) testNetworkStatsWifi(com.android.server.net.NetworkStatsServiceTest)
java.lang.NullPointerException: Attempt to invoke virtual method 'boolean android.net.NetworkCapabilities.hasCapability(int)' on a null object reference
at
com.android.server.net.NetworkStatsService.updateIfacesLocked(NetworkStatsService.java:983)
BUG:
30839080
(cherry picked from commit
574f370c6da52eeffe747248d68ef044617c7bcf)
(cherry picked from commit
77cba4bdf6de8aec02efe0da7e84f17603912b21)
Change-Id: I6eee96178ade6adfc1406e06d5376206ca2420e5
Hugo Benichi [Thu, 13 Oct 2016 07:48:42 +0000 (16:48 +0900)]
DO NOT MERGE: ConnectivityThread: use lazy holder idiom
This patch changes the way that the ConnectivityThread is lazily
instantiated by using the "lazy initialization holder class idiom".
The first code point that tries to obtain a reference to the unique
ConnectivityThread instance will trigger the creation of the Singleton
class, which will guarantee a thread-safe initialization of the static
INSTANCE field inside Singleton according to the language specs.
This is the Item #71 of Effective Java.
The unique static instance of ConnectivityThread is not stored directly
inside ConnectivityThread class but is stored in a static nested class.
This is to avoid triggering the creation of that unique instance when
Zygote does class preloading at phone startup. Otherwise this would lead
to Zygote creating a new OS thread during preloading, which is a fatal
error.
Test: frameworks-wifi tests pass
Bug:
26749700
Bug:
28537383
Bug:
32130437
(cherry picked from commit
c4fe5d373caa9f53686e4d58e61394dd40558957)
(cherry picked from commit
ce765b7a51d9452aaa32e43bedeefb7ad200df52)
Change-Id: Ic9a31809ef19e618246f9aa17f5df29bd65f8510
Hugo Benichi [Thu, 7 Jul 2016 01:15:56 +0000 (10:15 +0900)]
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
This patch removes the static singleton looper used by
ConnectivityManager and instead uses the common ConnectivityThread.
This allows to removes the static atomic counter used to track
the number of registered NetworkCallback in ConnectivityManager, because
the looper is not turned off anymore when no callbacks are registered.
Also an overloaded version of sendRequestForNetwork is added taking as a
new parameter a Handler. This will allow to overload various callback
and request related API calls with user provided Handlers.
Test: ConnectivityServiceTest passes
Bug:
26749700
Bug:
28537383
Bug:
32130437
(cherry picked from commit
7724cdd8b90006c852644d06cf6c8a28450c71c6)
(cherry picked from commit
1853f78d768dc44efdc8576302b382ff81a0ffac)
Change-Id: If5c1e46ca6c4a09ef526cbe09654c5f55ef8d6ce
Hugo Benichi [Wed, 6 Jul 2016 13:53:17 +0000 (22:53 +0900)]
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
This patch simplifies CallbackHandler in the following way:
- CallbackHandler directly uses the static references to
sNetworkCallback and sCallbackRefCount. This allows to remove
instance fields in CallbackHandler.
- CallbackHandler does not have a reference to ConnectivityManager
anymore
- CallbackHandler.getObject() is now generic in a type-safe way.
Test: ConnectivityServiceTest passes
Bug:
28537383
Bug:
32130437
(cherry picked from commit
d42650faaa33ec6274278c65a6042228555ddd4f)
(cherry picked from commit
4983e55853db9f9d1cc5720970c439b976480c52)
Change-Id: I4d0b2441b6af76bc56b19218210a2a381532a3c4
Philip P. Moltmann [Mon, 18 Apr 2016 23:23:06 +0000 (16:23 -0700)]
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
Fixes:
28530428
(cherry picked from commit
7d5da4b044183826ac8388c8bdb94ac979a81797)
(cherry picked from commit
29154b000f1dfa6d7bd6a12359f439770463ce3e)
Change-Id: Ib8f8da947af804c8b203928e57ed6a8aedbf0684
Jeremy Klein [Sun, 13 Mar 2016 00:29:54 +0000 (16:29 -0800)]
DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
This avoids a NullPointerException when trying to call the callback
and gives a more readable error message.
(cherry picked from commit
5f277e1667b49976a77c9fa79b9a04d775f3b49e)
(cherry picked from commit
c8e4cc8e9919260dac5f2f8a76b693e8a29bfcc1)
Change-Id: Ia5f328c4b25aa6624dc3c8493eb0c7bbab99904c
Etan Cohen [Thu, 27 Oct 2016 22:05:50 +0000 (15:05 -0700)]
DO NOT MERGE: [CS] Remove timeout event after first available
Guarantees that timeouts are only delivered if a network never
becomes available. Once a network is available the timeout is
canceled.
Bug:
31402633
Test: all timeout related unit tests pass (new one added)
(cherry picked from commit
681fcda5896fd6c94f8a543ef9983c0a0644e87e)
(cherry picked from commit
bf3b1bad15f45033d409669ac20e4b4e597065fd)
Change-Id: I0cf1a2b7d25bc9912e03fca30621809a9071396c
Hugo Benichi [Wed, 2 Nov 2016 04:43:22 +0000 (13:43 +0900)]
DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
Test methods not tagged with @{Small,Medium,Large}Test will not appear
in the Android Platform Continuous Testing dashboard.
Test methods tagged with @LargeTest will not be run in the Android
Platform Continuous Testing dashboard.
Test: ApfTest passes ($runtest frameworks-net)
Bug:
31479480
(cherry picked from commit
4195c28347cc100954f83c3c92b4dde4673f8608)
(cherry picked from commit
5d2654124e9e77dbda102a4435595c552cbc8e36)
Change-Id: Id718e8a02f8db96ff8babac3ec54192148f7bbbd
Lorenzo Colitti [Fri, 28 Oct 2016 08:45:55 +0000 (17:45 +0900)]
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
This was broken by the implementation of IPv6 tethering, which
relies on various private classes which end up calling unmockable
final classes like NetworkInterface.
Making everything public like this is almost certainly not the
best way of fixing this test, but on the other hand there is
value to the test continuing to pass.
Test: runtest frameworks-net # Everything passes.
Test: IPv6 tethering continues to work.
(cherry picked from commit
7e0eeca8ba4063d0d35dda9a8dfcc612e45efb87)
(cherry picked from commit
5bce5a16b17498981253d7a2d1a490667cd71798)
Change-Id: I3f399188f77fe3e5249443dcb61018a22c29d857
Lorenzo Colitti [Fri, 28 Oct 2016 03:48:36 +0000 (12:48 +0900)]
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
This will give us a good place to put all the networking tests.
Fix:
31479480
Test: adb shell am instrument -w -e notClass com.android.server.connectivity.tethering.TetherInterfaceStateMachineTest 'com.android.frameworks.tests.net/android.support.test.runner.AndroidJUnitRunner' # PASS
(cherry picked from commit
ecc986d430f4b8158f177ed97d2edb741f11ff71)
Change-Id: I4c417c2ba0747d2085169e47ae4a99e93c4d8814
Lorenzo Colitti [Fri, 28 Oct 2016 03:56:03 +0000 (12:56 +0900)]
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
Removing the static dependency on guava reduces test compile time
by about 20 seconds on a Z840, thus substantially speeding up the
compile/test cycle.
Make FutureIntent public instead of package-private because it is
used directly by NetworkPolicyManagementServiceTest, which as of
this CL is now in a different package.
(cherry picked from commit
281a17c9580de5c9898be7d9654d428801976511)
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest # PASS
Test: runtest frameworks-services -c com.android.server.NetworkPolicyManagerServiceTest # PASS
Test: runtest frameworks-services -c com.android.server.net.NetworkStatsServiceTest # PASS
Test: runtest frameworks-services -c com.android.server.NetworkManagementServiceTest # Already failing.
Bug:
31479480
(cherry picked from commit
3c295b59f5767904656235db48692906148ab631)
Change-Id: I8a95d4618dced81f173d2b38b9c1dfe3860b348a
Lorenzo Colitti [Fri, 28 Oct 2016 03:37:38 +0000 (12:37 +0900)]
DO NOT MERGE: Move FakeSettingsProvider to a common location.
(cherry picked from commit
7df1a82802cdf842d07a86a80383c7d5ea7ae53a)
Test: runtest frameworks-util -c com.android.internal.util.test.FakeSettingsProviderTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: runtest frameworks-services -c com.android.server.retaildemo.PreloadAppsInstallerTest
Test: runtest frameworks-services -c com.android.server.retaildemo.RetailDemoModeServiceTest
Bug:
31479480
(cherry picked from commit
b8df76e413d0b8235d0bd71adf8f368f00391fcb)
Change-Id: Ib82b162f354b8cbb521bc0783556f3225b4d12ac
Hugo Benichi [Mon, 17 Oct 2016 06:54:51 +0000 (15:54 +0900)]
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such
This patch extracts into its own independent test a test sub-block looking
for a race condition when not waiting on handlers to become idle:
there is no way to prevent the race from not happening when looking for
it this way. This makes the test flakky.
This new independent test is tagged with @FlakkyTest(tolerance = 3).
Test: ConnectivityServiceTest passes, with higher probability.
Bug:
31479480
(cherry picked from commit
c8c1027762d66c12c9c153ccbb8f80acdee8571c)
Change-Id: I32632bb763585c23f1de5bb1811a384a35bf9f64
Hugo Benichi [Thu, 6 Oct 2016 06:19:36 +0000 (15:19 +0900)]
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing
Test: added new unit tests
(cherry picked from commit
8acea76a2b7555b3bd5ca1170cca9d09e979fafc)
Change-Id: I4e6633984075d87c4e22466bc881629436359f7f
Erik Kline [Wed, 25 Nov 2015 03:49:38 +0000 (12:49 +0900)]
DO NOT MERGE: Support timeouts for requestNetwork() invocations.
(cherry-pick of
06c3ef1367e850746eef0a5462bdce8674d74c30)
(cherry picked from commit
57faba9ec73fbb311d5ca1df3278aee9728589d5)
Bug:
21414325
(cherry picked from commit
3841a48d0a093bbbd6ffe6338170e1e2dbc11997)
Change-Id: I640c43315a071ecbf881e5ce898164915e0b787f
Pierre Imai [Mon, 8 Feb 2016 07:01:40 +0000 (16:01 +0900)]
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is
specified for a given network.
Bug:
10705136
(cherry picked from commit
54f0d9edbf7f6ea6dd805dc77fdbf2c3848188e2)
(cherry picked from commit
accd5fcb79e1cd1b6c9cff7b14ff4c9ba78019a6)
Change-Id: I12ac6f511a6760ef26f489ba3a052ca3c125e5ee
Calin Juravle [Wed, 18 Jan 2017 04:15:48 +0000 (04:15 +0000)]
Merge "Refactor PackageDexOptimizer" am:
b3edbd7432 am:
8259b91984
am:
db19cad1db
Change-Id: I3825f93d837f9dcc0de4ef45b059a458d9970690
Calin Juravle [Wed, 18 Jan 2017 04:10:39 +0000 (04:10 +0000)]
Merge "Refactor PackageDexOptimizer" am:
b3edbd7432
am:
8259b91984
Change-Id: Ia7420cf2511c840b3f98979f79701e3f50b70924
Calin Juravle [Wed, 18 Jan 2017 04:06:14 +0000 (04:06 +0000)]
Merge "Refactor PackageDexOptimizer"
am:
b3edbd7432
Change-Id: I6ecee9500002c977de497f598abfd8be081dd584
Calin Juravle [Wed, 18 Jan 2017 03:59:19 +0000 (03:59 +0000)]
Merge "Refactor PackageDexOptimizer"
Jorge Lucangeli Obes [Wed, 18 Jan 2017 03:59:15 +0000 (03:59 +0000)]
Merge "PackageDexOptimizer: fix typo in log message." am:
228123dd53 am:
9323d8e163
am:
562e57185b
Change-Id: I3b01da80b187736e590e8c5d23b5ec1e07ed9730
Jorge Lucangeli Obes [Wed, 18 Jan 2017 03:54:16 +0000 (03:54 +0000)]
Merge "PackageDexOptimizer: fix typo in log message." am:
228123dd53
am:
9323d8e163
Change-Id: I67faa22374f52b3c763593fca1b895bde6a57ed7
Jorge Lucangeli Obes [Wed, 18 Jan 2017 03:49:41 +0000 (03:49 +0000)]
Merge "PackageDexOptimizer: fix typo in log message."
am:
228123dd53
Change-Id: I9bc4e9f9ac04a0666001b50dab4617986cf5da14
Treehugger Robot [Wed, 18 Jan 2017 03:42:46 +0000 (03:42 +0000)]
Merge "PackageDexOptimizer: fix typo in log message."
Calin Juravle [Wed, 4 Jan 2017 21:22:14 +0000 (13:22 -0800)]
Refactor PackageDexOptimizer
Split performDexoptLI in multiple smaller helpers. This will help in
adding the logic to process secondary dex files.
The goal is to move towards simple logic which can be reused between
compiling the package's code and its secondary dex files.
Test: device boots, packages get compiled in the background job,
adb shell cmd package compile -m speed|speed-profile packageName
Bug:
32871170
(cherry picked from commit
2d4b6ad7f38a3308d4f7be95219f0f9a6dde2d4d)
Change-Id: I802c16ec5c142d89b23c788011ef8f3daf5a9a61
Merged-In: I2d55edf42baa768f990939a82b3d52edf5f68a2c
Jorge Lucangeli Obes [Fri, 9 Dec 2016 20:28:31 +0000 (15:28 -0500)]
PackageDexOptimizer: fix typo in log message.
'oatDir' is the only token that has a space around the '='. None of the
other tokens in the log message do. Make the log message consistent so
that grepping is easier -- and the log message looks better.
Before:
PackageManager.DexOptimizer: Running dexopt (dex2oat) on:
/system/priv-app/Telecom/Telecom.apk pkg=com.android.server.telecom
isa=arm64 vmSafeMode=false debuggable=false
target-filter=interpret-only oatDir = null sharedLibraries=null
After:
PackageManager.DexOptimizer: Running dexopt (dex2oat) on:
/system/priv-app/Telecom/Telecom.apk pkg=com.android.server.telecom
isa=arm64 vmSafeMode=false debuggable=false
target-filter=interpret-only oatDir=null sharedLibraries=null
Bug: None
Test: Build, flash, grep for log message.
(cherry picked from commit
0f6250823612b2a43784bef12f833ac850bf2e2f)
Change-Id: Ic14ed7f634f1b36a76ed7b1e658c85078b87b4ad
Merged-In: I84162ec3535e3f83a60a62d40cbaf8e74d2051c6
Sunny Goyal [Wed, 18 Jan 2017 01:51:35 +0000 (01:51 +0000)]
Merge "Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates." into nyc-mr2-dev
am:
13f18efb8f
Change-Id: I0fa3b3d7c528a87f4a8b5c61c6383d2e4a83ccba
Sunny Goyal [Wed, 18 Jan 2017 01:51:31 +0000 (01:51 +0000)]
Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates.
am:
88959dccac
Change-Id: I535504ab5f70cd786973761b88d5e8e8bbec3ba8
Sunny Goyal [Wed, 18 Jan 2017 01:45:52 +0000 (01:45 +0000)]
Merge "Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates." into nyc-mr2-dev
Android Build Merger (Role) [Wed, 18 Jan 2017 01:32:55 +0000 (01:32 +0000)]
Merge "Merge "Fix issue with saving admins before finishing loading." into nyc-mr2-dev am:
5e2634ba55" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 18 Jan 2017 01:32:26 +0000 (01:32 +0000)]
Merge "Fix issue with saving admins before finishing loading. am:
adbda7474c" into nyc-mr2-dev-plus-aosp
Makoto Onuki [Wed, 18 Jan 2017 01:31:37 +0000 (01:31 +0000)]
Merge "Fix issue with saving admins before finishing loading." into nyc-mr2-dev
am:
5e2634ba55
Change-Id: I51c4e9f73502b1ae85b83799e86d072dc7293587
Kenny Guy [Wed, 18 Jan 2017 01:31:32 +0000 (01:31 +0000)]
Fix issue with saving admins before finishing loading.
am:
adbda7474c
Change-Id: Ie5b7117ecfbe0d42e69814dc904c056ba944f1ea
Jeff Sharkey [Wed, 18 Jan 2017 01:30:24 +0000 (01:30 +0000)]
Merge "Only measure each UID once in InstallerTest." am:
32aac7b9c9 am:
7b6d21b37e
am:
5092952317
Change-Id: Ib352977f7f01e97bc3afefb743f3ccb7725cbaec
Makoto Onuki [Wed, 18 Jan 2017 01:26:56 +0000 (01:26 +0000)]
Merge "Fix issue with saving admins before finishing loading." into nyc-mr2-dev
Jeff Sharkey [Wed, 18 Jan 2017 01:23:49 +0000 (01:23 +0000)]
Merge "Only measure each UID once in InstallerTest." am:
32aac7b9c9
am:
7b6d21b37e
Change-Id: I99a0c70e339a75da752be5dfb141b6835ca83cb3
Jeff Sharkey [Wed, 18 Jan 2017 01:18:51 +0000 (01:18 +0000)]
Merge "Only measure each UID once in InstallerTest."
am:
32aac7b9c9
Change-Id: Ie4b85e22fe74d8d07424edeacfc285a3cbd67dd0
Jeff Sharkey [Wed, 18 Jan 2017 01:10:59 +0000 (01:10 +0000)]
Merge "Only measure each UID once in InstallerTest."
Kenny Guy [Tue, 17 Jan 2017 23:33:41 +0000 (23:33 +0000)]
Fix issue with saving admins before finishing loading.
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.
Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services
Bug:
34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
Android Build Merger (Role) [Tue, 17 Jan 2017 23:12:09 +0000 (23:12 +0000)]
Merge "Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am:
332762aaf0 am:
df459cb2ea am:
0e9bda18ea" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 17 Jan 2017 23:12:02 +0000 (23:12 +0000)]
Merge "Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am:
332762aaf0 am:
df459cb2ea am:
70c0f5c2c7" into nyc-mr2-dev-plus-aosp
Svetoslav Ganov [Tue, 17 Jan 2017 23:11:31 +0000 (23:11 +0000)]
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am:
332762aaf0 am:
df459cb2ea
am:
0e9bda18ea
Change-Id: I259dac4b2cb2080286cbbb19ffb45284f6ef04a2
Svetoslav Ganov [Tue, 17 Jan 2017 23:11:28 +0000 (23:11 +0000)]
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am:
332762aaf0 am:
df459cb2ea
am:
70c0f5c2c7
Change-Id: I9a6c1bf3d8023ab1d0db442605b9c8bc7b9b5a3f
Android Build Merger (Role) [Tue, 17 Jan 2017 23:11:11 +0000 (23:11 +0000)]
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction. am:
016c9c8cb5 am:
a7ff8fbe74 am:
631370fa36" into nyc-mr2-dev-plus-aosp
Svetoslav Ganov [Tue, 17 Jan 2017 23:10:20 +0000 (23:10 +0000)]
[DO NOT MERGE] Prevent crash from early Toast surface destruction. am:
016c9c8cb5 am:
a7ff8fbe74
am:
631370fa36
Change-Id: Icd580da6fcdc670376f32d0b067bbdd0eff48a64
Svetoslav Ganov [Tue, 17 Jan 2017 23:10:17 +0000 (23:10 +0000)]
[DO NOT MERGE] Prevent crash from early Toast surface destruction. am:
016c9c8cb5 am:
a7ff8fbe74
am:
f5111345d2
Change-Id: Iacc6a87335f66f8a7631f6b8232744c75c8f949f
Svetoslav Ganov [Tue, 17 Jan 2017 23:04:00 +0000 (23:04 +0000)]
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am:
332762aaf0
am:
df459cb2ea
Change-Id: I0b9eb29e8d2425bce67024514bca116d5e3e94ee
Svetoslav Ganov [Tue, 17 Jan 2017 23:03:42 +0000 (23:03 +0000)]
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am:
332762aaf0
am:
df459cb2ea
Change-Id: I1239cde924e6d31222bf108c6d55ff19a78019ad
Selim Cinek [Tue, 17 Jan 2017 23:03:08 +0000 (23:03 +0000)]
Merge "Not allowing foreground services to be cleared as children" into nyc-mr2-dev
am:
c8278f35c7
Change-Id: Ic6cccd4760d102a1b69f664a99eb114d006f3d45
Selim Cinek [Tue, 17 Jan 2017 23:03:02 +0000 (23:03 +0000)]
Not allowing foreground services to be cleared as children
am:
1d35979f0a
Change-Id: Ic155154c0bc299f17e9885f77c23d080c6279633
Svetoslav Ganov [Tue, 17 Jan 2017 23:02:56 +0000 (23:02 +0000)]
[DO NOT MERGE] Prevent crash from early Toast surface destruction. am:
016c9c8cb5
am:
a7ff8fbe74
Change-Id: Id672b82ddba7aee6e3c2748a7fae1e9f879538aa
Svetoslav Ganov [Tue, 17 Jan 2017 23:02:52 +0000 (23:02 +0000)]
[DO NOT MERGE] Prevent crash from early Toast surface destruction. am:
016c9c8cb5
am:
a7ff8fbe74
Change-Id: Ic372436ee48a9f725c178a72c057a2192aad9267
Svetoslav Ganov [Tue, 17 Jan 2017 22:58:21 +0000 (22:58 +0000)]
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev
am:
332762aaf0
Change-Id: I20cc197cc2f1d4d9dd0b6b6c6fee07e71dd4a1d3
Svetoslav Ganov [Tue, 17 Jan 2017 22:58:18 +0000 (22:58 +0000)]
[DO NOT MERGE] Prevent crash from early Toast surface destruction.
am:
016c9c8cb5
Change-Id: Ib33d75a050a1b79de9590f2dbe03609c6e2b4463
Selim Cinek [Tue, 17 Jan 2017 22:57:08 +0000 (22:57 +0000)]
Merge "Not allowing foreground services to be cleared as children" into nyc-mr2-dev
TreeHugger Robot [Tue, 17 Jan 2017 22:53:38 +0000 (22:53 +0000)]
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev
Android Build Merger (Role) [Tue, 17 Jan 2017 22:32:29 +0000 (22:32 +0000)]
Merge "DO NOT MERGE: Propagate revoked permissions in permission review mode am:
4518d0be16 am:
20cf769d96" into nyc-mr2-dev-plus-aosp
Svet Ganov [Tue, 17 Jan 2017 22:31:47 +0000 (22:31 +0000)]
DO NOT MERGE: Propagate revoked permissions in permission review mode am:
4518d0be16
am:
1e3fd31932
Change-Id: I0bb05ec8471c8f4de55ac295650424caaa86748e
Svet Ganov [Tue, 17 Jan 2017 22:31:47 +0000 (22:31 +0000)]
DO NOT MERGE: Propagate revoked permissions in permission review mode am:
4518d0be16
am:
20cf769d96
Change-Id: I9fb218768a53a5f60aa90d1be34a6abfb2e8367d
Svet Ganov [Tue, 17 Jan 2017 22:27:46 +0000 (22:27 +0000)]
DO NOT MERGE: Propagate revoked permissions in permission review mode
am:
4518d0be16
Change-Id: If068f8560868264079b2d867ff3b08234dac9b96
Svet Ganov [Tue, 17 Jan 2017 22:27:40 +0000 (22:27 +0000)]
DO NOT MERGE: Propagate revoked permissions in permission review mode
am:
4518d0be16
Change-Id: Id0525c380c7b9aaf8c160b1e4fad24b9b2756a0d
Jeff Sharkey [Tue, 17 Jan 2017 22:22:30 +0000 (15:22 -0700)]
Only measure each UID once in InstallerTest.
Test: builds, boots
Bug:
34341727
Change-Id: Ic8250b7383f52adf30139ceed02469a9d278dc18
Svet Ganov [Tue, 17 Jan 2017 03:22:37 +0000 (19:22 -0800)]
DO NOT MERGE: Propagate revoked permissions in permission review mode
In permission review mode we represent install permissions for legacy
apps as constantly granted runtime ones since we need to keep per
user flags associated with a permission. We were not propagating
a revoked permission for a legacy app when the later is upgraded to
a modern app when permission review is enabled.
Test: CTS test passes and manual testing worked fine
Bug:
34240393
Change-Id: I32b8ffee89cc034661f8eb5a172dbe2349ea4a18
(cherry picked from commit
fe0253b34ec4fdb6afceb11193f29029b524866a)
Jesse Hall [Tue, 17 Jan 2017 22:11:26 +0000 (22:11 +0000)]
Merge "DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"" into nyc-mr2-dev
am:
31b755adea
Change-Id: I948e9c9a60327b9d25b6b5712904c780a52fdafa
Jesse Hall [Tue, 17 Jan 2017 22:11:16 +0000 (22:11 +0000)]
DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"
am:
e8ce1276e2
Change-Id: Ib5f68ce3a05cdb6e6f1bba5f6a17d0848e9a27ab
Manu Cornet [Tue, 17 Jan 2017 22:06:09 +0000 (22:06 +0000)]
Merge "2D Recents: Always use grid layout even in split view" into nyc-mr2-dev
am:
a4b7d794b3
Change-Id: I5ab24d4cb1f695672428ede37517846b9602ab72
Manu Cornet [Tue, 17 Jan 2017 22:06:02 +0000 (22:06 +0000)]
2D Recents: Always use grid layout even in split view
am:
c0432c63de
Change-Id: I79cda44ab6d3e3a17742f15e03eef419d88340ee
TreeHugger Robot [Tue, 17 Jan 2017 22:01:20 +0000 (22:01 +0000)]
Merge "DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"" into nyc-mr2-dev
Manu Cornet [Tue, 17 Jan 2017 21:58:05 +0000 (21:58 +0000)]
Merge "2D Recents: Always use grid layout even in split view" into nyc-mr2-dev
Manu Cornet [Fri, 13 Jan 2017 17:21:26 +0000 (09:21 -0800)]
2D Recents: Always use grid layout even in split view
Simplify the logic a bit, and polish the algorithm to accommodate the
various layout possibilities.
Bug:
32101881
Test: Checked layout in all orientations, with and without split view
Change-Id: I4a6dd3f7f34664908294ddaf5ea516d8e258edbf
Jesse Hall [Tue, 17 Jan 2017 20:34:14 +0000 (12:34 -0800)]
DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"
This reverts commit
93f630e1c3011a36f6560fd6115cf1a0e809c5e0.
Change has already been reverted in master, hence DO NOT MERGE.
Bug:
34348911
Ta-wei Yen [Tue, 17 Jan 2017 19:59:43 +0000 (19:59 +0000)]
Merge "Add getNetworkSpecifier() and getCarrierConfig()" am:
68d03b23bb am:
ea0e111468
am:
89a85b0683
Change-Id: I24966bccbea07ac42d4199d71c59c76ae19c967a
Ta-wei Yen [Tue, 17 Jan 2017 19:53:42 +0000 (19:53 +0000)]
Merge "Add getNetworkSpecifier() and getCarrierConfig()" am:
68d03b23bb
am:
ea0e111468
Change-Id: Ie40ccdc2ad2a30e8bbf3d6a6c4013ff5faf10cdd
Ta-wei Yen [Tue, 17 Jan 2017 19:47:24 +0000 (19:47 +0000)]
Merge "Add getNetworkSpecifier() and getCarrierConfig()"
am:
68d03b23bb
Change-Id: Ib4cf1d7f986a5ed4cc761f9abc10609de0bd22ff
Ta-wei Yen [Tue, 17 Jan 2017 19:38:26 +0000 (19:38 +0000)]
Merge "Add getNetworkSpecifier() and getCarrierConfig()"
Android Build Merger (Role) [Tue, 17 Jan 2017 19:08:45 +0000 (19:08 +0000)]
Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am:
cdad7f334b am:
9db7223591 am:
3d12f1b928" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 17 Jan 2017 19:08:19 +0000 (19:08 +0000)]
Merge "Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev am:
ebf7abb19e -s ours" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Tue, 17 Jan 2017 19:08:00 +0000 (19:08 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am:
2f6b711ffa -s ours" into nyc-mr2-dev-plus-aosp
Randy Pan [Tue, 17 Jan 2017 19:07:59 +0000 (19:07 +0000)]
Merge "Keep WIFI_FEATURE defines in sync with HAL" am:
cdad7f334b am:
9db7223591
am:
3d12f1b928
Change-Id: Id2d352f1f774a78bf389b6927591c778bb8eb072
Andrew Rossignol [Tue, 17 Jan 2017 19:07:05 +0000 (19:07 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev
am:
ebf7abb19e -s ours
Change-Id: I6c185f604e899f27a5c75aae883fd15de11033da
Andrew Rossignol [Tue, 17 Jan 2017 19:06:57 +0000 (19:06 +0000)]
Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"
am:
2f6b711ffa -s ours
Change-Id: I0e6ab7884eaa534f22b4af51c83836aaf4e0956c
Przemyslaw Szczepaniak [Tue, 17 Jan 2017 19:06:26 +0000 (19:06 +0000)]
Merge "Track libcore change
7d105d591c14afd00f894e8f3483adcbee6e901a" am:
751e3af81e am:
6b9cd13b05
am:
cc1074f6f4
Change-Id: I5a592a38d054665cfb4fe5f21bbf938556d42251
Randy Pan [Tue, 17 Jan 2017 18:48:00 +0000 (18:48 +0000)]
Merge "Keep WIFI_FEATURE defines in sync with HAL" am:
cdad7f334b
am:
9db7223591
Change-Id: I50e0de71d4fc0de18d7bf0c21c4f1a2518530f36
Przemyslaw Szczepaniak [Tue, 17 Jan 2017 18:46:25 +0000 (18:46 +0000)]
Merge "Track libcore change
7d105d591c14afd00f894e8f3483adcbee6e901a" am:
751e3af81e
am:
6b9cd13b05
Change-Id: Id77f008ca75d2570eb34d84950e24bac4e447df8
TreeHugger Robot [Tue, 17 Jan 2017 18:42:42 +0000 (18:42 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev
Randy Pan [Tue, 17 Jan 2017 18:28:21 +0000 (18:28 +0000)]
Merge "Keep WIFI_FEATURE defines in sync with HAL"
am:
cdad7f334b
Change-Id: I16520e6aa16e49b33bf393e2cdc3bd1ae8f3fdc4
Przemyslaw Szczepaniak [Tue, 17 Jan 2017 18:26:57 +0000 (18:26 +0000)]
Merge "Track libcore change
7d105d591c14afd00f894e8f3483adcbee6e901a"
am:
751e3af81e
Change-Id: I6c0ebb09325ab2f37469c9d4a5408f812380efc1
Randy Pan [Tue, 17 Jan 2017 18:10:01 +0000 (18:10 +0000)]
Merge "Keep WIFI_FEATURE defines in sync with HAL"
Treehugger Robot [Tue, 17 Jan 2017 17:55:16 +0000 (17:55 +0000)]
Tobias Thierer [Tue, 17 Jan 2017 11:36:58 +0000 (11:36 +0000)]
Merge "API: Update java.util.Date to OpenJDK8u60" am:
a2343a7e78 am:
d8d1d9682d
am:
d6be4be618
Change-Id: Iebadb6be0a880ede9033f0cd03a4a53c7695dcb7
Tobias Thierer [Tue, 17 Jan 2017 11:21:01 +0000 (11:21 +0000)]
Merge "API: Update java.util.Date to OpenJDK8u60" am:
a2343a7e78
am:
d8d1d9682d
Change-Id: I04b50fee184ba129d986832bfadbee8325f9c56f
Tobias Thierer [Tue, 17 Jan 2017 11:05:24 +0000 (11:05 +0000)]
Merge "API: Update java.util.Date to OpenJDK8u60"
am:
a2343a7e78
Change-Id: Ic56a141a6ffad9c0080ac3d942d2b669f8ca37d5
Tobias Thierer [Tue, 17 Jan 2017 10:41:34 +0000 (10:41 +0000)]
Merge "API: Update java.util.Date to OpenJDK8u60"
Lorenzo Colitti [Tue, 17 Jan 2017 06:08:28 +0000 (06:08 +0000)]
Merge "Delete dead code." am:
cf59ff79c5 am:
d305a7c894
am:
8cf7169564
Change-Id: Ia662fd845fcfb4ade631d8aacf6bcff3c92a1543
Lorenzo Colitti [Tue, 17 Jan 2017 06:02:30 +0000 (06:02 +0000)]
Merge "Delete dead code." am:
cf59ff79c5
am:
d305a7c894
Change-Id: Icdb4d429fcdf4060feab8a25cf67b3a230a35eb7
Lorenzo Colitti [Tue, 17 Jan 2017 05:55:50 +0000 (05:55 +0000)]
Merge "Delete dead code."
am:
cf59ff79c5
Change-Id: Ifbb591a7bbed9c2a8f83fe321c3d12f08e096fe3
Treehugger Robot [Tue, 17 Jan 2017 05:44:57 +0000 (05:44 +0000)]
Merge "Delete dead code."
Erik Kline [Tue, 17 Jan 2017 05:20:52 +0000 (05:20 +0000)]
Merge "Move tests added in n-mr2 into new aosp location." am:
5511f7cfc2 am:
ac6e0cc770
am:
b1d4313777
Change-Id: I62688cacb486f55bb48ea55b14e4e3416493ea30
Erik Kline [Tue, 17 Jan 2017 05:19:56 +0000 (05:19 +0000)]
Move tests added in n-mr2 into new aosp location. am:
e446acf954 am:
88f3295464
am:
4e9ffd6e91
Change-Id: I3b4f9303c5d4495e4b8556b1db6d5cad5543a10c
Erik Kline [Tue, 17 Jan 2017 05:09:33 +0000 (05:09 +0000)]
Merge "Move tests added in n-mr2 into new aosp location." am:
5511f7cfc2
am:
ac6e0cc770
Change-Id: I9f6c96c47ae63e4f812427317592e9994b1d72fd