OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Reset Keyguard when clicking emergency call button" into oc-dev
Jorim Jaggi [Tue, 23 May 2017 11:10:57 +0000 (11:10 +0000)]
Merge "Reset Keyguard when clicking emergency call button" into oc-dev
am: ff389264d9

Change-Id: I557863570a252fc84b76198a4acf0534a55af47c

7 years agoMerge "Reset Keyguard when clicking emergency call button" into oc-dev
Jorim Jaggi [Tue, 23 May 2017 11:04:21 +0000 (11:04 +0000)]
Merge "Reset Keyguard when clicking emergency call button" into oc-dev

7 years agoMerge "Re-run pinner service on camera app update and dex optimization." into oc-dev
Carmen Jackson [Tue, 23 May 2017 09:30:25 +0000 (09:30 +0000)]
Merge "Re-run pinner service on camera app update and dex optimization." into oc-dev
am: a7e45e364c

Change-Id: Idd235d42904bb03ef38a1bb3972b9e82353bbaff

7 years agoMerge "Re-run pinner service on camera app update and dex optimization." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 09:24:13 +0000 (09:24 +0000)]
Merge "Re-run pinner service on camera app update and dex optimization." into oc-dev

7 years agoMerge "Check network info for metering state on AccessPoint." into oc-dev
Stephen Chen [Tue, 23 May 2017 08:34:22 +0000 (08:34 +0000)]
Merge "Check network info for metering state on AccessPoint." into oc-dev
am: 73c04555ac

Change-Id: I85bd2269bac0cd072d06a036e09f6aea924da6ba

7 years agoMerge "Check network info for metering state on AccessPoint." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 08:29:45 +0000 (08:29 +0000)]
Merge "Check network info for metering state on AccessPoint." into oc-dev

7 years agoMerge "Fix NetworkStatsAccessTest" am: ec1f25a4ba am: cdb75d321b
Hugo Benichi [Tue, 23 May 2017 07:02:54 +0000 (07:02 +0000)]
Merge "Fix NetworkStatsAccessTest" am: ec1f25a4ba am: cdb75d321b
am: 85afabc4ec

Change-Id: I60f9d8867655a6aa24ee192c772d4c26a96c9bcd

7 years agoMerge "Fix NetworkStatsAccessTest" am: ec1f25a4ba
Hugo Benichi [Tue, 23 May 2017 06:56:48 +0000 (06:56 +0000)]
Merge "Fix NetworkStatsAccessTest" am: ec1f25a4ba
am: cdb75d321b

Change-Id: I5ef9861438bbe474b4e4670b8fdba4368531978d

7 years agoMerge "Fix NetworkStatsAccessTest"
Hugo Benichi [Tue, 23 May 2017 06:51:15 +0000 (06:51 +0000)]
Merge "Fix NetworkStatsAccessTest"
am: ec1f25a4ba

Change-Id: If949493d9967fa723667947979262bf4f90841c2

7 years agoMerge "Fix NetworkStatsAccessTest"
Hugo Benichi [Tue, 23 May 2017 06:43:06 +0000 (06:43 +0000)]
Merge "Fix NetworkStatsAccessTest"

7 years agoMerge "ConnectivityManager: simplify callback handler" am: 857e7d9c85 am: 7bce658dd6
Hugo Benichi [Tue, 23 May 2017 06:37:24 +0000 (06:37 +0000)]
Merge "ConnectivityManager: simplify callback handler" am: 857e7d9c85 am: 7bce658dd6
am: a67fb638fa

Change-Id: I3934666df4a02101351993f7f83fb0a42124a2f5

7 years agoMerge "ConnectivityManager: simplify callback handler" am: 857e7d9c85
Hugo Benichi [Tue, 23 May 2017 06:30:48 +0000 (06:30 +0000)]
Merge "ConnectivityManager: simplify callback handler" am: 857e7d9c85
am: 7bce658dd6

Change-Id: Ica9d4fbb1dd0ba9da4aaea0fbc3571c3446110ef

7 years agoCheck network info for metering state on AccessPoint.
Stephen Chen [Fri, 19 May 2017 22:55:02 +0000 (15:55 -0700)]
Check network info for metering state on AccessPoint.

This resolves bug where networks manually marked as metered by Settings
UI were not tagged with a metered friction icon in the Wi-Fi picker.

Bug: 38460378
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I2ffe25e898ac001549e7d7492a2aa335ee415a4e

7 years agoMerge "ConnectivityManager: simplify callback handler"
Hugo Benichi [Tue, 23 May 2017 06:24:16 +0000 (06:24 +0000)]
Merge "ConnectivityManager: simplify callback handler"
am: 857e7d9c85

Change-Id: I8d5371b69fcec3f1f625923eb65191b4c018bb00

7 years agoMerge "ConnectivityManager: simplify callback handler"
Treehugger Robot [Tue, 23 May 2017 06:16:47 +0000 (06:16 +0000)]
Merge "ConnectivityManager: simplify callback handler"

7 years agoMerge "Refactor TISM add/remove code" am: 5041bbde19 am: c85053f7eb
Erik Kline [Tue, 23 May 2017 05:12:44 +0000 (05:12 +0000)]
Merge "Refactor TISM add/remove code" am: 5041bbde19 am: c85053f7eb
am: 2e33be3ca9

Change-Id: Ic1bcb3ca011bdc886086f34be18409eb5b12f521

7 years agoMerge "Refactor TISM add/remove code" am: 5041bbde19
Erik Kline [Tue, 23 May 2017 05:03:05 +0000 (05:03 +0000)]
Merge "Refactor TISM add/remove code" am: 5041bbde19
am: c85053f7eb

Change-Id: Id001b164a7eca7b4e681eefbadf4b87bb1f7dbd1

7 years agoMerge "ConnectivityServiceTest: fix flakyness" am: a82cac1452 am: 004f36d5bc
Hugo Benichi [Tue, 23 May 2017 04:56:41 +0000 (04:56 +0000)]
Merge "ConnectivityServiceTest: fix flakyness" am: a82cac1452 am: 004f36d5bc
am: eb9d0f16aa

Change-Id: Ic792060aafb5aa8b485054be18c3dba82bb15a3b

7 years agoMerge "Refactor TISM add/remove code"
Erik Kline [Tue, 23 May 2017 04:56:40 +0000 (04:56 +0000)]
Merge "Refactor TISM add/remove code"
am: 5041bbde19

Change-Id: I2475a3cbff37248509e21dd058ed8f3d827fefd0

7 years agoMerge "ConnectivityServiceTest: fix flakyness" am: a82cac1452
Hugo Benichi [Tue, 23 May 2017 04:49:09 +0000 (04:49 +0000)]
Merge "ConnectivityServiceTest: fix flakyness" am: a82cac1452
am: 004f36d5bc

Change-Id: Id8468bd8e38927341cdbebe2925c0bfd4bb37c0c

7 years agoMerge "Refactor TISM add/remove code"
Treehugger Robot [Tue, 23 May 2017 04:44:22 +0000 (04:44 +0000)]
Merge "Refactor TISM add/remove code"

7 years agoMerge "ConnectivityServiceTest: fix flakyness"
Hugo Benichi [Tue, 23 May 2017 04:42:40 +0000 (04:42 +0000)]
Merge "ConnectivityServiceTest: fix flakyness"
am: a82cac1452

Change-Id: I241192b2d9565c41f47bbe6227b50049898da679

7 years agoMerge "ConnectivityServiceTest: fix flakyness"
Hugo Benichi [Tue, 23 May 2017 04:35:08 +0000 (04:35 +0000)]
Merge "ConnectivityServiceTest: fix flakyness"

7 years agoMerge "Merge "Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f...
Android Build Merger (Role) [Tue, 23 May 2017 03:44:13 +0000 (03:44 +0000)]
Merge "Merge "Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f am: 0187514f74" into nyc-mr2-dev-plus-aosp am: 7ee4542d17" into oc-dev-plus-aosp

7 years agoMerge "Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f am...
Hugo Benichi [Tue, 23 May 2017 03:43:21 +0000 (03:43 +0000)]
Merge "Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f am: 0187514f74" into nyc-mr2-dev-plus-aosp
am: 7ee4542d17

Change-Id: Ibe3c29fa1c483965531694b3d4b8f6a8154e546d

7 years agoMerge "Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f am...
Android Build Merger (Role) [Tue, 23 May 2017 03:42:45 +0000 (03:42 +0000)]
Merge "Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f am: 0187514f74 am: b800e8520e" into oc-dev-plus-aosp

7 years agoMerge "ConnectivityManager: improve argument validation" am: cdfd3a186f am: 0187514f74
Hugo Benichi [Tue, 23 May 2017 03:41:52 +0000 (03:41 +0000)]
Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f am: 0187514f74
am: b800e8520e

Change-Id: Idfc0938025c633c89f5bfddd88b3721876d085ef

7 years agoMerge "Merge "Added IWLAN metered APN support" am: 70fe11fc38 am: ab48527680 am:...
Android Build Merger (Role) [Tue, 23 May 2017 03:41:21 +0000 (03:41 +0000)]
Merge "Merge "Added IWLAN metered APN support" am: 70fe11fc38 am: ab48527680 am: b8f3e388fc" into oc-dev-plus-aosp

7 years agoMerge "Added IWLAN metered APN support" am: 70fe11fc38 am: ab48527680
Jack Yu [Tue, 23 May 2017 03:39:49 +0000 (03:39 +0000)]
Merge "Added IWLAN metered APN support" am: 70fe11fc38 am: ab48527680
am: b8f3e388fc

Change-Id: Ia03104b1604bb34c6993171e848aa6193409726a

7 years agoMerge "Revert "Changed alert window notifications to use single channel"" into oc-dev
Wale Ogunwale [Tue, 23 May 2017 03:38:03 +0000 (03:38 +0000)]
Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev
am: 540cb28c5a

Change-Id: I188f1e181ff7feab8d1da92f6ef72ac43d47719c

7 years agoMerge "Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f am...
Android Build Merger (Role) [Tue, 23 May 2017 03:34:41 +0000 (03:34 +0000)]
Merge "Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f am: 0187514f74" into nyc-mr2-dev-plus-aosp

7 years agoMerge "ConnectivityManager: improve argument validation" am: cdfd3a186f
Hugo Benichi [Tue, 23 May 2017 03:34:02 +0000 (03:34 +0000)]
Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f
am: 0187514f74

Change-Id: Ida4b1412270b54f6abe5aa75b7f83d2ffaca0669

7 years agoMerge "Revert "Changed alert window notifications to use single channel"" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 03:32:38 +0000 (03:32 +0000)]
Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev

7 years agoMerge "ConnectivityManager: improve argument validation" am: cdfd3a186f
Hugo Benichi [Tue, 23 May 2017 03:26:32 +0000 (03:26 +0000)]
Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f
am: 0187514f74

Change-Id: I7ffbc1799d9da901fb38db469720479760892bba

7 years agoMerge "ConnectivityManager: improve argument validation"
Hugo Benichi [Tue, 23 May 2017 03:20:33 +0000 (03:20 +0000)]
Merge "ConnectivityManager: improve argument validation"
am: cdfd3a186f

Change-Id: I3adb40fe1bd1779d745bb122da06e33068ce48a3

7 years agoMerge "ConnectivityManager: improve argument validation"
Treehugger Robot [Tue, 23 May 2017 03:14:29 +0000 (03:14 +0000)]
Merge "ConnectivityManager: improve argument validation"

7 years agoMerge "SurfaceView: Don't destroy Surface while Stopped." into oc-dev
Robert Carr [Tue, 23 May 2017 02:36:21 +0000 (02:36 +0000)]
Merge "SurfaceView: Don't destroy Surface while Stopped." into oc-dev
am: 42c6529c1d

Change-Id: I5f883c2760e8056d2130d232fb7ca43576339a17

7 years agoMerge "SurfaceView: Don't destroy Surface while Stopped." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 02:32:13 +0000 (02:32 +0000)]
Merge "SurfaceView: Don't destroy Surface while Stopped." into oc-dev

7 years agoMerge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev
Rubin Xu [Tue, 23 May 2017 01:51:08 +0000 (01:51 +0000)]
Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev
am: da3d71f01e

Change-Id: I8000419d8abd92b247b7de6b5816cc43883facd1

7 years agoMerge changes from topic 'am-3c32cf60aa7d4143a4aec89ba3f5325d' into oc-dev-plus-aosp
Android Build Merger (Role) [Tue, 23 May 2017 01:47:06 +0000 (01:47 +0000)]
Merge changes from topic 'am-3c32cf60aa7d4143a4aec89ba3f5325d' into oc-dev-plus-aosp

* changes:
  ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6 am: 3946a75cb3 am: 3c529012d3 am: ce8a0dea71 am: 87cef51e2b
  system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a am: 02f0044d98 am: 6cadbad153 am: fdf1fdfc1b  -s ours am: ac9121b73a

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 01:45:52 +0000 (01:45 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6 am: 3946a75cb3 am: 3c529012d3 am: ce8a0dea71
am: 87cef51e2b

Change-Id: Ib75547b414bd593ecadcba0cb483da4671f4bf7f

7 years agoMerge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 01:45:37 +0000 (01:45 +0000)]
Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 01:44:24 +0000 (01:44 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a am: 02f0044d98 am: 6cadbad153 am: fdf1fdfc1b  -s ours
am: ac9121b73a

Change-Id: Ib5dfae4d8cf649b4e2bddda218091cb946a9a3cc

7 years agoRevert "Changed alert window notifications to use single channel"
Wale Ogunwale [Tue, 23 May 2017 01:43:59 +0000 (01:43 +0000)]
Revert "Changed alert window notifications to use single channel"

This reverts commit 8f7bebca3656f4993edef290e62c960f245ff373.

We now want multiple channels so the user can disable which ever ones they like.

Change-Id: I6015cd5f1e3f37a8a01e1db42b57a94087780304
Fixes: 38428796
Bug: 37422870

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 01:43:14 +0000 (01:43 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6 am: 3946a75cb3 am: 3c529012d3 am: ce8a0dea71
am: 604a49118f

Change-Id: I7b681f224f6f57eb6fea644fcb04d5b5f3614233

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 01:41:51 +0000 (01:41 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a am: 02f0044d98 am: 6cadbad153 am: fdf1fdfc1b
am: f00f966fcf  -s ours

Change-Id: I5813d8d1906a199e6d79a9c46c7df75e24089f52

7 years agoConnectivityManager: simplify callback handler
Hugo Benichi [Tue, 9 May 2017 05:36:02 +0000 (14:36 +0900)]
ConnectivityManager: simplify callback handler

Bug: 36701874
Test: $ runtest frameworks-net
Change-Id: I4d5f08903a54f8dced7cb6ae86703847b908b784

7 years agoConnectivityManager: improve argument validation
Hugo Benichi [Tue, 9 May 2017 06:19:01 +0000 (15:19 +0900)]
ConnectivityManager: improve argument validation

Using Preconditions and dedicated static methods for checking arguments
to improve error stack traces without error messages.

Test: covered by previously added unit test
Bug: 36701874
Change-Id: Id872b2c887a4bca43a8c3644622add1c2ee57c6d

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 01:37:59 +0000 (01:37 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6 am: 3946a75cb3 am: 3c529012d3
am: ce8a0dea71

Change-Id: I9cd7b091b2ce4640a1d7729fb081aef9a3186ab8

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 01:36:35 +0000 (01:36 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a am: 02f0044d98 am: 6cadbad153
am: fdf1fdfc1b  -s ours

Change-Id: If386c7ba25e1c8d1730e7191abb48ba75971d8af

7 years agoMerge "Bump overlay version number." into oc-dev
Andrew Sapperstein [Tue, 23 May 2017 01:25:22 +0000 (01:25 +0000)]
Merge "Bump overlay version number." into oc-dev
am: daa0f4026a

Change-Id: Id62d3e337bc9f582b2344a8ef6b43cc533b81189

7 years agoMerge "Bump overlay version number." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 01:20:33 +0000 (01:20 +0000)]
Merge "Bump overlay version number." into oc-dev

7 years agoFix NetworkStatsAccessTest
Hugo Benichi [Mon, 22 May 2017 05:33:05 +0000 (14:33 +0900)]
Fix NetworkStatsAccessTest

This patch fixes NetworkStatsAccessTest by taking into account
DEVICESUMMARY which was added in commit
3a8b343ce5220086c4f71e63f5d42f2d28434c4b.

Doing $ git revert 3a8b343ce5220086c4f71e63f5d42f2d28434c4b shows that
the existing assertions of NetworkStatsAccessTest passed before that
commit.

This patch also changes NetworkStatsAccessTest to use up-to-date testing
style and not depend on the deprecated junit.framework.TestCase.

Bug: 32561414
Test: runtest -x frameworks/base/../NetworkStatsAccessTest.java
Change-Id: Ib78f137578cf35e1c766b377b7f812a09173c49e

7 years agoConnectivityServiceTest: fix flakyness
Hugo Benichi [Mon, 22 May 2017 01:44:02 +0000 (10:44 +0900)]
ConnectivityServiceTest: fix flakyness

This patch attempts to fix the remaining spurious failures in
ConnectivityServiceTest, which have two causes:
 - waitForIdle() does not take into account the NetworkAgents handlers.
 - the deadlines in testRequestBenchmark are sometimes exceeded.

To fix the first issue, waitForIdle() is moved to a test level instance
method and also calls waitForIdleHandler on any non null
MockNetworkAgent. This is expected to fix spurious errors for the
following tests:
  - testMobildeDataAlwaysOn
  - testLingering
  - testPacketKeepAlive
  - testMMSonWiFi

To fix the second issue, the deadlines for testRequestBenchmark are
extended by 10ms. Also, the failure message is made more actionable by
providing the total time it took for the operation, instead of printing
the number of dispatches that were achieved before the deadline.

Bug: 32561414
Test: tests pass many times in a row (~500).
Change-Id: Id33c6ac1edfb0b89634fa7789dccb2da237e2709

7 years agoMerge "Added IWLAN metered APN support" am: 70fe11fc38
Jack Yu [Tue, 23 May 2017 01:16:30 +0000 (01:16 +0000)]
Merge "Added IWLAN metered APN support" am: 70fe11fc38
am: ab48527680

Change-Id: Ib88c94860f6ef6c61531c9547c0ab993f8bdde37

7 years agoMerge "Added IWLAN metered APN support"
Jack Yu [Tue, 23 May 2017 01:10:29 +0000 (01:10 +0000)]
Merge "Added IWLAN metered APN support"
am: 70fe11fc38

Change-Id: I12573353fca921d1454d6829302a379cd6b2cc8b

7 years agoMerge "Added IWLAN metered APN support"
Treehugger Robot [Tue, 23 May 2017 01:02:31 +0000 (01:02 +0000)]
Merge "Added IWLAN metered APN support"

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 00:47:08 +0000 (00:47 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6 am: 3946a75cb3 am: 3c529012d3
am: ce8a0dea71

Change-Id: I7f963478355bf0019520c6d9242a6670398698f0

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 00:46:08 +0000 (00:46 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a am: 02f0044d98 am: 6cadbad153
am: fdf1fdfc1b

Change-Id: I76b74d2ec3f72bfc6b3ec6247beb40589112fdfd

7 years agoMerge "Blanket deny instant apps from some methods" into oc-dev
Todd Kennedy [Tue, 23 May 2017 00:41:32 +0000 (00:41 +0000)]
Merge "Blanket deny instant apps from some methods" into oc-dev
am: dc28b0fdcb

Change-Id: I401af533ebec4826c57a7ea2e7b83096f3c27a14

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 00:39:49 +0000 (00:39 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6 am: 3946a75cb3
am: 3c529012d3

Change-Id: I9b3ea4577928b601f81525390fa6dae525275323

7 years agoMerge "Align preference text to actionbar title." into oc-dev
Fan Zhang [Tue, 23 May 2017 00:39:34 +0000 (00:39 +0000)]
Merge "Align preference text to actionbar title." into oc-dev
am: eb4712d7bd

Change-Id: I3dc67fe6dde23f8024ed2c2add53651153bd49ba

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 00:38:33 +0000 (00:38 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a am: 02f0044d98
am: 6cadbad153

Change-Id: I05c01c682c89b4ae42ef9f66a94da611c7378148

7 years agoMerge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev
Suprabh Shukla [Tue, 23 May 2017 00:33:15 +0000 (00:33 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev
am: 7a940ac844

Change-Id: I2f67d726346362796f12f83540f8bbc1e3f12cc1

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 00:25:35 +0000 (00:25 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6
am: 3946a75cb3

Change-Id: I9992c35cfc2b2ad8c4bbff7bf4bf9ca79b6f4568

7 years agoMerge "Blanket deny instant apps from some methods" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 00:24:35 +0000 (00:24 +0000)]
Merge "Blanket deny instant apps from some methods" into oc-dev

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 00:24:33 +0000 (00:24 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a
am: 02f0044d98

Change-Id: I8fbd6580c4b6c1595b0ff1c34faaec5e1b9ad4de

7 years agoMerge "Align preference text to actionbar title." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 00:22:44 +0000 (00:22 +0000)]
Merge "Align preference text to actionbar title." into oc-dev

7 years agoMerge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev
Sudheer Shanka [Tue, 23 May 2017 00:22:36 +0000 (00:22 +0000)]
Merge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev
am: 9765bcf761

Change-Id: I0843273dd409075eb924e88854309b7b502b09d0

7 years agoMerge "Read cpu freq data only when needed." into oc-dev
Sudheer Shanka [Tue, 23 May 2017 00:20:34 +0000 (00:20 +0000)]
Merge "Read cpu freq data only when needed." into oc-dev
am: fdeb6b8ed3

Change-Id: I241535a379b8e3cf547d73c05fe0dc7298ccc958

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 00:18:31 +0000 (00:18 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446
am: 5f4382e2a6

Change-Id: Ieab172a133b0d9198cef008b037c4a1107d0746c

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 00:17:22 +0000 (00:17 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f
am: dc87ac995a

Change-Id: Ic7e65852a72cde3d2e285774e9cb85e9590e7fd2

7 years agoMerge "Fixes landscape minimized bounds for launcher hiding widget control" into...
Matthew Ng [Tue, 23 May 2017 00:16:05 +0000 (00:16 +0000)]
Merge "Fixes landscape minimized bounds for launcher hiding widget control" into oc-dev
am: 7f48176022

Change-Id: I3aa5adcd7e16b36c7d614330a68d698210e63954

7 years agoRe-run pinner service on camera app update and dex optimization.
Carmen Jackson [Tue, 16 May 2017 17:37:26 +0000 (10:37 -0700)]
Re-run pinner service on camera app update and dex optimization.

When the camera app updates or the dex files are optimized, the files
that have been pinned by the pinner service fall out of date. The next
time they're used, they will be paged in like normal. This change
un-pins and re-pins the Camera app when the user's camera app updates,
as well as when background dex optimization finishes.

Bug: 33168521
Test: Manual. Here's a logcat of PinnerService activity while I ran the
following commands:

$ flashall -w
$ adb install -r -d --force-sdk [new camera app].apk
Success
$ adb root
restarting adbd as root
$ adb shell cmd package bg-dexopt-job

SystemServer: PinnerService
SystemServiceManager: Starting com.android.server.PinnerService
PinnerService: Starting PinnerService
SystemServerTiming: PinnerService took to complete: 2ms
PinnerService: Pinned file = /system/framework/arm64/boot-framework.oat
PinnerService: Pinned file = /system/framework/arm64/boot-framework.vdex
PinnerService: Pinned file = /system/framework/oat/arm64/services.odex
PinnerService: Pinned file = /system/framework/oat/arm64/services.vdex
PinnerService: Pinned file = /system/framework/arm64/boot.oat
PinnerService: Pinned file = /system/framework/arm64/boot.vdex
PinnerService: Pinned file =
/system/framework/arm64/boot-core-libart.oat
PinnerService: Pinned file =
/system/framework/arm64/boot-core-libart.vdex
PinnerService: Pinned /system/app/GoogleCamera/GoogleCamera.apk
PinnerService: Pinned
/data/dalvik-cache/arm64/system@app@GoogleCamera@GoogleCamera.apk@classes.dex
PinnerService: Updating pinned files.
PinnerService: Unpinned file /system/app/GoogleCamera/GoogleCamera.apk
PinnerService: Unpinned file
/data/dalvik-cache/arm64/system@app@GoogleCamera@GoogleCamera.apk@classes.dex
PinnerService: Pinned
/data/app/com.google.android.GoogleCamera-vVji3RQcPHS1Lzqh1WjY1g==/base.apk
PinnerService: Pinned
/data/app/com.google.android.GoogleCamera-vVji3RQcPHS1Lzqh1WjY1g==/oat/arm64/base.odex
PinnerService: Updating pinned files.
PinnerService: Unpinned file
/data/app/com.google.android.GoogleCamera-vVji3RQcPHS1Lzqh1WjY1g==/base.apk
PinnerService: Unpinned file
/data/app/com.google.android.GoogleCamera-vVji3RQcPHS1Lzqh1WjY1g==/oat/arm64/base.odex
PinnerService: Pinned
/data/app/com.google.android.GoogleCamera-vVji3RQcPHS1Lzqh1WjY1g==/base.apk
PinnerService: Pinned
/data/app/com.google.android.GoogleCamera-vVji3RQcPHS1Lzqh1WjY1g==/oat/arm64/base.odex

Change-Id: I10d72d6a3d1717773324913362a638f199d49bc9

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 00:07:43 +0000 (00:07 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519
am: a07389b446

Change-Id: I5e8fdff89b3d8d1e36f24767dc60efa1dc352dcb

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 00:06:55 +0000 (00:06 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee
am: 12c5f0da9f

Change-Id: I8ce1d6a2399967cf0408adf7ffbe1839f471e1e7

7 years agoMerge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 00:02:13 +0000 (00:02 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev

7 years agoMerge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev
Sudheer Shanka [Tue, 23 May 2017 00:01:54 +0000 (00:01 +0000)]
Merge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev

7 years agoAdded IWLAN metered APN support
Jack Yu [Sun, 21 May 2017 00:06:33 +0000 (17:06 -0700)]
Added IWLAN metered APN support

If the device is in IWLAN mode, when checking if the APN
type is metered, we read the settings from the IWLAN
metered APN list.

Test: Telephony unit tests
bug: 38304530

Merged-In: I46c9e1a15dd0dd40811d5a959d558fc78608b127
Change-Id: I46c9e1a15dd0dd40811d5a959d558fc78608b127

7 years agoMerge "Read cpu freq data only when needed." into oc-dev
Sudheer Shanka [Mon, 22 May 2017 23:51:56 +0000 (23:51 +0000)]
Merge "Read cpu freq data only when needed." into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Mon, 22 May 2017 23:51:48 +0000 (23:51 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413
am: 7a06357519

Change-Id: I9301189268f519d4b87d8c9bfa88d1da4e8a53cd

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Mon, 22 May 2017 23:50:57 +0000 (23:50 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31
am: 5bfe82c3ee

Change-Id: I95333a7ff3d6ee1a3161d436a2a0b312931b663e

7 years agoMerge "Fixes landscape minimized bounds for launcher hiding widget control" into...
TreeHugger Robot [Mon, 22 May 2017 23:50:06 +0000 (23:50 +0000)]
Merge "Fixes landscape minimized bounds for launcher hiding widget control" into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Mon, 22 May 2017 23:36:12 +0000 (23:36 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9
am: 66a08a5413

Change-Id: Ica5cb7828a37bd597dc0d83f7a65e89380d1e31c

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Mon, 22 May 2017 23:35:04 +0000 (23:35 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af
am: 7fd2d8ea31

Change-Id: I4b57d119b9b8d512a017ede0fb62658fb25f9580

7 years agoMerge "Properly defer entrance animations until after the stack is reloaded." into...
Winson Chung [Mon, 22 May 2017 23:30:08 +0000 (23:30 +0000)]
Merge "Properly defer entrance animations until after the stack is reloaded." into oc-dev
am: bc13f7174a

Change-Id: Ifa487b7d65ad5a3c21654c6910fb785d47a1a0f1

7 years agoMerge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev
Jerry Zhang [Mon, 22 May 2017 23:27:43 +0000 (23:27 +0000)]
Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev
am: 3a958a09d2

Change-Id: If10f8cf662369ecbb95bc6f04388271a535cd259

7 years agoMerge "Properly defer entrance animations until after the stack is reloaded." into...
Winson Chung [Mon, 22 May 2017 23:20:09 +0000 (23:20 +0000)]
Merge "Properly defer entrance animations until after the stack is reloaded." into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Mon, 22 May 2017 23:19:09 +0000 (23:19 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab
am: 55c8a1ede9

Change-Id: Ia3e4d749c5b5475640325fd47eb4260d52e61365

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Mon, 22 May 2017 23:18:24 +0000 (23:18 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d
am: 982b8018af

Change-Id: I8cb5052694668ee8021f75778244e4d1b6cc3bb5

7 years agoMerge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev
Jerry Zhang [Mon, 22 May 2017 23:13:53 +0000 (23:13 +0000)]
Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev

7 years agoMerge "Fix Companion UI crash on configuration change" into oc-dev
Eugene Susla [Mon, 22 May 2017 23:09:13 +0000 (23:09 +0000)]
Merge "Fix Companion UI crash on configuration change" into oc-dev
am: c1e3ab359f

Change-Id: Ia856f6b9c5db4f5b061930469650321bc1452497

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39
Nick Kralevich [Mon, 22 May 2017 23:02:54 +0000 (23:02 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39
am: 47beaa8fab

Change-Id: Ie697e5e8bfb7664b410d564a84ae5784be890f90

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2
Nick Kralevich [Mon, 22 May 2017 23:02:13 +0000 (23:02 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2
am: f5bd84b82d

Change-Id: I163a9224d6b0ff5f42f52656773e1c297661b977

7 years agoMerge "Fix Companion UI crash on configuration change" into oc-dev
Eugene Susla [Mon, 22 May 2017 22:54:34 +0000 (22:54 +0000)]
Merge "Fix Companion UI crash on configuration change" into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8
Nick Kralevich [Mon, 22 May 2017 22:46:18 +0000 (22:46 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8
am: 8965cd6a39

Change-Id: If549cda5fd1a640fee746311745b9b08ebf63b91

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973
Nick Kralevich [Mon, 22 May 2017 22:45:44 +0000 (22:45 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973
am: c46889e2d2

Change-Id: I840740012d9ba0c434f7de0fd9ca83a44926d018

7 years agoMerge "Do not relayout on default focus highlight." into oc-dev
Jiaquan He [Mon, 22 May 2017 22:36:42 +0000 (22:36 +0000)]
Merge "Do not relayout on default focus highlight." into oc-dev
am: badb83b332

Change-Id: I7174ffcfef9d32b4b7559251060cea8ce8a34d58

7 years agoMerge "Do not relayout on default focus highlight." into oc-dev
Jiaquan He [Mon, 22 May 2017 22:25:09 +0000 (22:25 +0000)]
Merge "Do not relayout on default focus highlight." into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c
Nick Kralevich [Mon, 22 May 2017 22:24:39 +0000 (22:24 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c
am: 1cc9ec47c8

Change-Id: Ic81685686dabbc1f0004a30785a021bf89420846