OSDN Git Service
Kenny Guy [Wed, 18 Jan 2017 17:55:04 +0000 (17:55 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed am:
1894632864
am:
748e78bd2c
Change-Id: I6d8c1b6e6f6b171527fa48bf477926a31aa5aacf
Kenny Guy [Wed, 18 Jan 2017 17:47:02 +0000 (17:47 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed
am:
1894632864
Change-Id: I4328578f929875fd59f48681b8ae2c7c4d3bd623
Kenny Guy [Wed, 18 Jan 2017 17:33:33 +0000 (17:33 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af
am:
ee9f03d1ed
Change-Id: Ic724588cbab8d4282eeb5bc806f8c67791189a05
Kenny Guy [Wed, 18 Jan 2017 17:27:10 +0000 (17:27 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a
am:
b275a205af
Change-Id: I01487d9c39f4e82b63961cdd43df238f2bfd2b89
Kenny Guy [Wed, 18 Jan 2017 17:13:31 +0000 (17:13 +0000)]
Fix issue with saving admins before finishing loading.
am:
f98ed6863a
Change-Id: I7f816c164548df86f9607c86772902efd0d53620
Tucker Sylvestro [Wed, 18 Jan 2017 16:41:54 +0000 (16:41 +0000)]
svc nfc should support watches too am:
1876583bfb
am:
eed0a7bf45
Change-Id: If7f2515750bb74d0c9f3baae9fe0a1fc3eeb36ef
Tucker Sylvestro [Wed, 18 Jan 2017 16:34:50 +0000 (16:34 +0000)]
svc nfc should support watches too
am:
1876583bfb
Change-Id: Ic3f0277c2c13dbd2c4f8b6ec5dbe9f9dc34ef297
Tucker Sylvestro [Wed, 14 Dec 2016 19:01:14 +0000 (14:01 -0500)]
svc nfc should support watches too
Check for both FEATURE_NFC and FEATURE_NFC_HOST_CARD_EMULATION in the
"svc nfc" command. Watches may only have the latter, but should still
support the nfc enable/disable command.
See b/
24532713#comment7 for context.
Bug
32386425
Change-Id: I307798f00728c6b437aebfcf58115af7265e3692
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
(cherry picked from commit
adbda7474cc1968b66e9948aee566dc346e71340)
Paul Duffin [Wed, 18 Jan 2017 11:39:39 +0000 (11:39 +0000)]
Merge "Add legacy-android-test target containing android.test classes" am:
c20518139a am:
78af448c30
am:
2ac0e2a186
Change-Id: I965734e5064fccf08ae676047078632e7a95f3c7
Paul Duffin [Wed, 18 Jan 2017 11:34:39 +0000 (11:34 +0000)]
Merge "Add legacy-android-test target containing android.test classes" am:
c20518139a
am:
78af448c30
Change-Id: I272502ca8504683f5feb4abf345a2665e99da057
Paul Duffin [Wed, 18 Jan 2017 11:30:04 +0000 (11:30 +0000)]
Merge "Add legacy-android-test target containing android.test classes"
am:
c20518139a
Change-Id: I0c591f26a7fe4ebbb89a7fb6ad6b5bb846756c99
Paul Duffin [Wed, 18 Jan 2017 11:19:57 +0000 (11:19 +0000)]
Merge "Add legacy-android-test target containing android.test classes"
Lorenzo Colitti [Wed, 18 Jan 2017 10:29:51 +0000 (10:29 +0000)]
Merge changes from topic 'net-update-mr2-dev-plus-aosp' into nyc-mr2-dev-plus-aosp
* changes:
DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
DO NOT MERGE: Add missing dependency.
DO NOT MERGE: Show notification for always-on app VPN
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
DO NOT MERGE: Define API for metering network stats buckets.
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
DO NOT MERGE: ConnectivityThread: use lazy holder idiom
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
DO NOT MERGE: [CS] Remove timeout event after first available
DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
DO NOT MERGE: Move FakeSettingsProvider to a common location.
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing
DO NOT MERGE: Support timeouts for requestNetwork() invocations.
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network.
Hugo Benichi [Wed, 19 Oct 2016 04:48:40 +0000 (13:48 +0900)]
DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
Test: manually created a bug report and inspected content.
(cherry picked from commit
51d14cb60793a9a073b8a29ff7875bb518cd7d54)
(cherry picked from commit
5635c270a1bda538181daa260902a59030f084e6)
Change-Id: I612b4ab9431633758d3a7048966c267d20cdfcbe
Lorenzo Colitti [Fri, 9 Dec 2016 05:19:57 +0000 (14:19 +0900)]
DO NOT MERGE: Add missing dependency.
(cherry picked from commit
744b02069d7589dc192b19fac6c3e7d62d02e88a)
Change-Id: I3030cc7a718e99ab129fc14174b6d917b9b8e7fb
Tony Mak [Thu, 30 Jun 2016 10:19:20 +0000 (11:19 +0100)]
DO NOT MERGE: Show notification for always-on app VPN
This is the same notification as the one shown during legacy lockdown
mode, sans the 'reset' button.
The notification is only shown during times when VPN has not yet
established or has failed, for example during boot or after a crash.
Bug:
29123115
(cherry picked from commit
1a405fe300950d6ceae2166fd074b596d8110dbe)
(cherry picked from commit
de7f7d195eec64802b7b6eee819c699f1a7d6951)
Change-Id: I42b4b24e25175bb7628b46a79431d2592644803c
Stephen Chen [Fri, 21 Oct 2016 19:44:26 +0000 (12:44 -0700)]
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
Dependent on ag/
1550196 where API is defined.
Bug:
31015360
Bug:
26545374
Test: runtest --path
frameworks/base/core/tests/coretests/src/android/net/NetworkStatsTest.java,
other test classes.
(cherry picked from commit
25147878974f82f875062e99cdee85dd33f3f078)
(cherry picked from commit
963e8ddf6d5ea3bc34216fa03fe24402bf13940a)
Change-Id: I79e401fc4159264a075febba82bd8c295b8e677f
Hugo Benichi [Tue, 15 Nov 2016 04:42:34 +0000 (13:42 +0900)]
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
This patch introduces an assertEventuallyThat helper function in
ConnectivityServiceTest which given a boolean function retries until the
function returns true or until a maximum retry time is reached.
This function is used to fix flakyness of testAvoidBadWifiSetting where
the Message posted by reevaluate() could reach the Handler's
MessageQueue after waitForIdle takes effect, resulting in the test to
fail.
Instead of fixing the flakyness by introdcing hard sleep times,
assertEventuallyThat is used to reduce the overall test time.
With this change the test has been observed to pass with 100% success
rate over 50000 invocations.
Test: $ runtest frameworks-net
Bug:
32561414
(cherry picked from commit
99c8294ef0c7a720364abb5884063e0a9d1bb5fe)
(cherry picked from commit
53d83d51424a496978d2ff2d86845a2284515712)
Change-Id: I432f90a699dadfef37a5d0a69e25050753340964
Hugo Benichi [Tue, 15 Nov 2016 02:25:52 +0000 (11:25 +0900)]
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
This patch fixes flakyness of testRequestBenchmark by adjusting time
limit for callback registration from 100ms to 180ms, and time limits for
onAvailable and onLost triggers from 30ms to 40ms.
With these timeouts the test succeeds 100% over 5000 iterations.
When using 150ms for registration timeout, running the test 5000 times
fails 2 times.
When using 30ms for onLost timeout, running the test 5000 times fails
1 times.
In addition, this patch also cleans testRequestBenchmark and uses the
more stable SystemClock.elapsedRealtime() for duration measurements.
Test: $ runtest frameworks-net
Bug:
32561414
(cherry picked from commit
38be57b438a0c1754091f045317db2049304e16f)
(cherry picked from commit
cbf8ff83a8b342e6ebeaa83794dace3c6d0b1488)
Change-Id: I3caf10025f203156a297c0b522f24768a18accc9
Jeff Sharkey [Fri, 2 Dec 2016 19:17:21 +0000 (12:17 -0700)]
DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
Also add logging to measure success/failure details.
Test: builds, boots, and NTP fix obtained
Bug:
32969463
(cherry picked from commit
d3f689bf14a05de735b5cc92dcf20e7226c78690)
(cherry picked from commit
dda938a698a17b2943bbe78f6631a26dedabf28a)
Change-Id: I67e4f54f8f2ec69b6522fbbe06ef196b1084f44a
Stephen Chen [Tue, 18 Oct 2016 23:41:47 +0000 (16:41 -0700)]
DO NOT MERGE: Define API for metering network stats buckets.
This is a continuation of b/
26545374, since now we can also set the
metered bit with NetworkScorer. The tracking of metered state changes
will be implemented in a seperate CL.
Bug:
31015360
Bug:
26545374
Test: N/A
(cherry picked from commit
9ac251d1169639c7b955d63b21e80cbc5c394090)
(cherry picked from commit
dadf6caf9f2a8c360203a3f141a8c1366159ec4d)
Change-Id: I01ebb270c5bf7f2383e8923cce72545ca1bee118
Felipe Leme [Thu, 18 Aug 2016 23:20:01 +0000 (16:20 -0700)]
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.net.NetworkStatsServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
BUG:
30943463
(cherry picked from commit
b8f946dc4b24998f14e28573e452ab13ed533347)
(cherry picked from commit
e4c029918f32f9dacc7e6a1e8102b71f3ca1018c)
Change-Id: I93cdfc8753dcded141732c0587783d1fa2085f5a
Felipe Leme [Mon, 22 Aug 2016 15:50:43 +0000 (08:50 -0700)]
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
BUG:
30839080
BUG:
31007021
(cherry picked from commit
fc7d7a359f800d7320d29055ef3b4b75157aaf13)
(cherry picked from commit
2026ca147b6460807b19c997600315806ecb3197)
Change-Id: I45efc93b40e526467c97d0735289db1404ccd22d
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
Narayan Kamath [Wed, 18 Jan 2017 10:04:10 +0000 (10:04 +0000)]
Merge "API: Unhide MethodHandles API (java.lang.invoke)." am:
71b1d50531 am:
ec667adb56
am:
aa90336510
Change-Id: I1e0f760ea4ddc5cac238c17a8cf2e53b40706af9
Narayan Kamath [Wed, 18 Jan 2017 09:59:09 +0000 (09:59 +0000)]
Merge "API: Unhide MethodHandles API (java.lang.invoke)." am:
71b1d50531
am:
ec667adb56
Change-Id: I73976eab1d344763582caeb6ef9ee6881986472b
Narayan Kamath [Wed, 18 Jan 2017 09:53:09 +0000 (09:53 +0000)]
Merge "API: Unhide MethodHandles API (java.lang.invoke)."
am:
71b1d50531
Change-Id: I4813654889a3a088cf8ee5dae0c5655aa520c341
Erik Kline [Wed, 18 Jan 2017 09:51:31 +0000 (09:51 +0000)]
Merge "Restore legacy types when registering mobile requests" am:
85f67dc60a am:
47453e01cb
am:
1a1a7f6e75
Change-Id: I9eb1ca8a19cca3a28e81392dbd988e5c2cee02c7
Narayan Kamath [Wed, 18 Jan 2017 09:46:15 +0000 (09:46 +0000)]
Merge "API: Unhide MethodHandles API (java.lang.invoke)."
Erik Kline [Wed, 18 Jan 2017 09:46:06 +0000 (09:46 +0000)]
Merge "Restore legacy types when registering mobile requests" am:
85f67dc60a
am:
47453e01cb
Change-Id: Ic849eb5f85fd835fe4615f5a22afec3e569cf005
Erik Kline [Wed, 18 Jan 2017 09:41:00 +0000 (09:41 +0000)]
Merge "Restore legacy types when registering mobile requests"
am:
85f67dc60a
Change-Id: I124d28e85711f81216e552bb93dd1994081c9452
Treehugger Robot [Wed, 18 Jan 2017 09:34:36 +0000 (09:34 +0000)]
Merge "Restore legacy types when registering mobile requests"
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
Erik Kline [Wed, 18 Jan 2017 07:08:06 +0000 (16:08 +0900)]
Restore legacy types when registering mobile requests
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- vanilla wifi to mobile tethering (no DUN)
- tested with DUN by:
- adding "dun" to the APN type
- adb shell settings put global tether_dun_required 1
- verified the bug exists without this fix
Bug:
32163131
Bug:
34364553
Change-Id: Idf1a9a2c8191c40abed29e1789f62aefb83ed1ce
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