OSDN Git Service
Kazuki Kobayashi [Thu, 19 Jan 2017 22:30:05 +0000 (22:30 +0000)]
Merge "Fix clipping for date and time on QS" am:
a5f968806e
am:
6cad668a25
Change-Id: I19ae46145d788db06e64b1b1737b7c30ae53f7f0
Kazuki Kobayashi [Thu, 19 Jan 2017 22:25:23 +0000 (22:25 +0000)]
Merge "Fix clipping for date and time on QS"
am:
a5f968806e
Change-Id: I75c89c14ba9fe723ce47bff9061c716aee225735
Treehugger Robot [Thu, 19 Jan 2017 22:17:35 +0000 (22:17 +0000)]
Merge "Fix clipping for date and time on QS"
Rebecca Silberstein [Thu, 19 Jan 2017 21:31:06 +0000 (21:31 +0000)]
Merge "SystemServer: cherry-pick p2p service start" am:
4c937464eb
am:
392f7d789c
Change-Id: I737b1307f4c42b8c88974418e3b6dab6b117509f
Rebecca Silberstein [Thu, 19 Jan 2017 21:26:00 +0000 (21:26 +0000)]
Merge "SystemServer: cherry-pick p2p service start"
am:
4c937464eb
Change-Id: I6f851c4e157150cab541d9a991cc1b7fe736eb7c
Rebecca Silberstein [Thu, 19 Jan 2017 21:21:23 +0000 (21:21 +0000)]
Merge "SystemServer: cherry-pick p2p service start"
yuanhao [Thu, 19 Jan 2017 19:05:54 +0000 (19:05 +0000)]
Merge "Fixed NPE in canAddMoreManagedProfiles" am:
a83222e4fb
am:
8d3a8b1327
Change-Id: I8a5f9b7fcf46d2a801446fabece327ddceec3add
yuanhao [Thu, 19 Jan 2017 19:00:55 +0000 (19:00 +0000)]
Merge "Fixed NPE in canAddMoreManagedProfiles"
am:
a83222e4fb
Change-Id: Icd63296061485d29a95fa6c6735a8c1a91099afc
Treehugger Robot [Thu, 19 Jan 2017 18:53:24 +0000 (18:53 +0000)]
Merge "Fixed NPE in canAddMoreManagedProfiles"
Tyler Gunn [Thu, 19 Jan 2017 18:34:53 +0000 (18:34 +0000)]
Merge "Adding self-managed connection service APIs." am:
3a7253a09d
am:
2155be0218
Change-Id: I75319e09f352905ffa45194086b11711f9070c70
Tyler Gunn [Thu, 19 Jan 2017 18:29:54 +0000 (18:29 +0000)]
Merge "Adding self-managed connection service APIs."
am:
3a7253a09d
Change-Id: I5d7aa094d71e40bc2ce8e6d051c757a82d9c6083
Treehugger Robot [Thu, 19 Jan 2017 18:23:33 +0000 (18:23 +0000)]
Merge "Adding self-managed connection service APIs."
Jeff Sharkey [Thu, 19 Jan 2017 16:26:23 +0000 (16:26 +0000)]
Merge "Follow installd API changes." am:
915f279556
am:
6b662722f0
Change-Id: Ia9406884d17226b10cae21fd2d98eecb9e5e7253
Jeff Sharkey [Thu, 19 Jan 2017 16:21:54 +0000 (16:21 +0000)]
Merge "Follow installd API changes."
am:
915f279556
Change-Id: Ib362db25a0393e859909e06a00dbb0c655fd4b47
Jeff Sharkey [Thu, 19 Jan 2017 16:16:02 +0000 (16:16 +0000)]
Merge "Follow installd API changes."
Przemyslaw Szczepaniak [Thu, 19 Jan 2017 14:22:48 +0000 (14:22 +0000)]
Merge "Track libcore java.util.logging update to ojdk8u60" am:
76edc3b8a5
am:
0823ed394b
Change-Id: Iee0a79ac5f1770b218e6ff9e4a9f0d14c3c90378
Przemyslaw Szczepaniak [Thu, 19 Jan 2017 14:16:56 +0000 (14:16 +0000)]
Merge "Track libcore java.util.logging update to ojdk8u60"
am:
76edc3b8a5
Change-Id: I0598b566f4d02a6d14c6be86f917bcef48bbf748
Przemyslaw Szczepaniak [Thu, 19 Jan 2017 14:11:12 +0000 (14:11 +0000)]
Merge "Track libcore java.util.logging update to ojdk8u60"
Orion Hodson [Thu, 19 Jan 2017 13:47:37 +0000 (13:47 +0000)]
Merge "API: Unhide dalvik.system.InMemoryDexClassLoader" am:
e5c3aed8dc
am:
a08d67495c
Change-Id: I4ea03fd453e58737b795c9f856db6a8312fdd1a0
Orion Hodson [Thu, 19 Jan 2017 13:43:05 +0000 (13:43 +0000)]
Merge "API: Unhide dalvik.system.InMemoryDexClassLoader"
am:
e5c3aed8dc
Change-Id: I90cd3d3b09000bd3e1961a63d95eede19f0bd12e
Orion Hodson [Thu, 19 Jan 2017 13:35:50 +0000 (13:35 +0000)]
Merge "API: Unhide dalvik.system.InMemoryDexClassLoader"
Paul Duffin [Thu, 19 Jan 2017 11:44:56 +0000 (11:44 +0000)]
Merge "Prepare for removal of legacy-test from default targets" am:
c74ccf1588
am:
ab62fd67d8
Change-Id: I923de1762a15fca7dc255f9dfe0ecce6f54d333c
Paul Duffin [Thu, 19 Jan 2017 11:40:22 +0000 (11:40 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
am:
c74ccf1588
Change-Id: Id4876a2597171ac78062acf8194fce1af6d50b77
Treehugger Robot [Thu, 19 Jan 2017 11:32:10 +0000 (11:32 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
Erik Kline [Thu, 19 Jan 2017 11:22:55 +0000 (11:22 +0000)]
Merge "Try to deduplicate observer iteration code" am:
c8223d0874
am:
c822d054a3
Change-Id: Icfa3b57630a6d8d31f68f7d11d09e7ee0b97cc73
Erik Kline [Thu, 19 Jan 2017 11:18:47 +0000 (11:18 +0000)]
Merge "Try to deduplicate observer iteration code"
am:
c8223d0874
Change-Id: I89c4fe6c7c669b7e84c67d0bed9cc97da09cffd0
Treehugger Robot [Thu, 19 Jan 2017 11:10:21 +0000 (11:10 +0000)]
Merge "Try to deduplicate observer iteration code"
Erik Kline [Thu, 19 Jan 2017 09:49:43 +0000 (09:49 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers" am:
0ac7232b7c
am:
9b986734e4
Change-Id: I2a3817e030adeef54012177380e886771502308c
Erik Kline [Thu, 19 Jan 2017 09:46:09 +0000 (09:46 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers"
am:
0ac7232b7c
Change-Id: Id82777e6760c36e8f8dd59b447fa5862c295d59b
Paul Duffin [Tue, 10 Jan 2017 12:08:23 +0000 (12:08 +0000)]
Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
(cherry picked from
6387604f9e672ece85e07c4bcbd7be396867f06f)
Bug:
30188076
Test: make checkbuild
Merged-In: I13e88297731253420e4e5f5291d503f13a39a156
Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b
Treehugger Robot [Thu, 19 Jan 2017 09:38:26 +0000 (09:38 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers"
Erik Kline [Wed, 18 Jan 2017 11:54:14 +0000 (20:54 +0900)]
Try to deduplicate observer iteration code
Later on, registerObserver() can take a handler argument and
invokeForAllObservers() can be updated to post to it when
provided.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ibc32079e1084e2e43f7826fe6b2bdbb83c482e26
Erik Kline [Thu, 19 Jan 2017 05:24:26 +0000 (14:24 +0900)]
Eschew unspecified IP addresses for DNS servers
Test: as follows
- built
- flashed
- booted
- runtest frameworks-wifi passes (though no test covers this code yet)
Bug:
34210527
Change-Id: I2d44445982dfb3221f7b6394daf0479c1fa8a6e1
yuanhao [Wed, 18 Jan 2017 01:54:45 +0000 (09:54 +0800)]
Fixed NPE in canAddMoreManagedProfiles
We can use the command 'adb shell pm create-user --profileOf -10000
--managed TestProfile_12345678' to reproduce the problem.
Signed-off-by: yuanhao <yuanhao@xiaomi.com>
Michael Wright [Thu, 19 Jan 2017 02:16:53 +0000 (02:16 +0000)]
Merge "Validate custom pointer icons aren't null." into cw-f-dev
am:
05b2d3eb0d
Change-Id: Ice9cc30ff6e4f3048d165e346b13f51a4fcaff2a
Michael Wright [Thu, 19 Jan 2017 02:16:45 +0000 (02:16 +0000)]
Validate custom pointer icons aren't null.
am:
35068079c8
Change-Id: I68c8a45c8bd207b82a9d82d6f2fd5c7fb85b098c
TreeHugger Robot [Thu, 19 Jan 2017 02:12:10 +0000 (02:12 +0000)]
Merge "Validate custom pointer icons aren't null." into cw-f-dev
Tao Bao [Thu, 19 Jan 2017 01:59:19 +0000 (01:59 +0000)]
Merge "Revert "RecoverySystem: Fix the issue in installPackage()."" am:
9311dbf9e4
am:
731445ebf7
Change-Id: Ia111f153277e0648ea4d3f37d7c928621cd21ca2
Tao Bao [Thu, 19 Jan 2017 01:55:47 +0000 (01:55 +0000)]
Merge "Revert "RecoverySystem: Fix the issue in installPackage().""
am:
9311dbf9e4
Change-Id: Ife949ce113387e2834f25c49d41adf4eec44bba2
Tao Bao [Thu, 19 Jan 2017 01:47:09 +0000 (01:47 +0000)]
Merge "Revert "RecoverySystem: Fix the issue in installPackage().""
Tao Bao [Tue, 17 Jan 2017 20:42:43 +0000 (12:42 -0800)]
Revert "RecoverySystem: Fix the issue in installPackage()."
This reverts commit
9f7a0acd2d383b825bcdcbef25d6b42f9875acfe.
Bug:
34350643
Bug:
34396955
Test: installPackage() doesn't cause deadlock if it doesn't call
processPackage() prior to that.
Change-Id: I1da055c86a3326ae341da1b4d5dc79ab4be256fb
Peng Xu [Thu, 19 Jan 2017 01:22:22 +0000 (01:22 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am:
cec2ebf676
am:
8cddb920b5
Change-Id: I60391477badc56373f231911aae4172ee8d5cdf0
Peng Xu [Thu, 19 Jan 2017 01:17:42 +0000 (01:17 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
am:
cec2ebf676
Change-Id: I1f66dba79c07315ca07edf65ff4e7f1135083d6e
Peng Xu [Thu, 19 Jan 2017 01:11:49 +0000 (01:11 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
Josh Gao [Wed, 18 Jan 2017 23:55:54 +0000 (23:55 +0000)]
Merge changes from topic 'kill_debuggerd' am:
cfb19e3ac8
am:
fe6eb8761d
Change-Id: Ia02b6894b0a6d92fa7c6c9c3af6ba22fd1995930
Josh Gao [Wed, 18 Jan 2017 23:45:20 +0000 (23:45 +0000)]
Switch android.os.Debug to libdebuggerd_client. am:
3ce369601e
am:
18e852e9aa
Change-Id: I51f806c6e8ab2d2c00d9cf7dbc68b62f69a3a742
Josh Gao [Wed, 18 Jan 2017 23:44:31 +0000 (23:44 +0000)]
app_process: don't use PR_SET_NO_NEW_PRIVS. am:
92517e4c03
am:
b6025a2be1
Change-Id: I4fe51640d77e16866b5897cdc70424e9bd640066
Josh Gao [Wed, 18 Jan 2017 23:43:29 +0000 (23:43 +0000)]
Remove peercred check from NativeCrashListener. am:
b9eb093c3c
am:
9e5ef0e5d7
Change-Id: I2d01ce780d1e7c9cd5dc435be00b245ce8bdac24
Josh Gao [Wed, 18 Jan 2017 23:26:12 +0000 (23:26 +0000)]
Merge changes from topic 'kill_debuggerd'
am:
cfb19e3ac8
Change-Id: I805db402362fd2d9822e3aaa0ed004431fccfd79
Josh Gao [Wed, 18 Jan 2017 23:19:21 +0000 (23:19 +0000)]
Switch android.os.Debug to libdebuggerd_client.
am:
3ce369601e
Change-Id: Ife04ddf4f6d0d6311a3c2c857b12fd792c3269f8
Josh Gao [Wed, 18 Jan 2017 23:18:40 +0000 (23:18 +0000)]
app_process: don't use PR_SET_NO_NEW_PRIVS.
am:
92517e4c03
Change-Id: I6eee7cc8642f0a09e6fbac1612744da8ba09e7fc
Josh Gao [Wed, 18 Jan 2017 23:17:40 +0000 (23:17 +0000)]
Remove peercred check from NativeCrashListener.
am:
b9eb093c3c
Change-Id: If777f29a165862b652c293f3127d89e5adbbe145
Josh Gao [Wed, 18 Jan 2017 23:04:08 +0000 (23:04 +0000)]
Merge changes from topic 'kill_debuggerd'
* changes:
Switch android.os.Debug to libdebuggerd_client.
app_process: don't use PR_SET_NO_NEW_PRIVS.
Remove peercred check from NativeCrashListener.
Tyler Gunn [Mon, 9 Jan 2017 17:43:12 +0000 (09:43 -0800)]
Adding self-managed connection service APIs.
1. Adding new APIs for self-managed connection services.
2. Adding Telecom package-level documentation.
Test: Manual (unit, cts pending; this is just scaffolding for now)
Bug:
34159263
Change-Id: Ic226ec8bfcb2fbcc02fe802b47499e47aab17d0a
Svet Ganov [Wed, 18 Jan 2017 21:04:24 +0000 (21:04 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev
am:
b8c8b67789 -s ours
Change-Id: Iae2e5a94b21db8f35a67466bc039966315c73f46
Svet Ganov [Wed, 18 Jan 2017 21:04:21 +0000 (21:04 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
am:
4a601f972a -s ours
Change-Id: I8798244ed83cab82094aed1705d719cf5c2188e4
TreeHugger Robot [Wed, 18 Jan 2017 20:57:07 +0000 (20:57 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev
Michael Wright [Wed, 18 Jan 2017 18:09:29 +0000 (18:09 +0000)]
Validate custom pointer icons aren't null.
Bug:
33853287
Test: cts
Change-Id: I844a9aec6e37e306a77eee0644a774f6470cf5df
(cherry picked from commit
b004b5137e12bffae9a3d3ae97440c8c24bdc07a)
Pavlin Radoslavov [Wed, 18 Jan 2017 20:30:44 +0000 (20:30 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am:
5fd543ec34
am:
fd2f4bbcca
Change-Id: I3c253b5ee444f23fc81dc607dcc85e95b2aa3226
Pavlin Radoslavov [Wed, 18 Jan 2017 20:26:52 +0000 (20:26 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
am:
5fd543ec34
Change-Id: I69c8396f015dc926c135a0284a347c6d6d8ca870
Treehugger Robot [Wed, 18 Jan 2017 20:20:47 +0000 (20:20 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
Tamas Berghammer [Wed, 18 Jan 2017 19:59:50 +0000 (19:59 +0000)]
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp
Tamas Berghammer [Wed, 18 Jan 2017 19:59:50 +0000 (19:59 +0000)]
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
Tamas Berghammer [Wed, 18 Jan 2017 16:36:46 +0000 (16:36 +0000)]
DO NOT MERGE: Revert "Fix build"
This reverts commit
005055c070a4e174a493fe585e467c0e711b96e9.
Change-Id: Ia71d1e95de48bc1d83a4924041953a2d42ed6a93
Tamas Berghammer [Wed, 18 Jan 2017 16:17:32 +0000 (16:17 +0000)]
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
This reverts commit
cbd3f0c59a75e0b46dbb0635e81f82b8b9617791.
Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
Jeff Sharkey [Wed, 18 Jan 2017 19:11:31 +0000 (12:11 -0700)]
Follow installd API changes.
Test: builds, boots, clearing strategy looks sane
Bug:
33965858
Change-Id: Ie5bbb71fb7a464999215c22e5a1fef0c07a620a4
Svet Ganov [Tue, 17 Jan 2017 21:50:46 +0000 (13:50 -0800)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
Bug:
34193954
Change-Id: Id744fd190ef78e498e635c2ab9936f12d0bbc917
(cherry picked from commit
6130fb741c86d7d4f0f86e3a875c3eca1fe8aa51)
Pavlin Radoslavov [Tue, 17 Jan 2017 21:04:13 +0000 (13:04 -0800)]
Update/cleanup Bluetooth Codec strings in Developer Settings
Misc. fixes and cleanup related to the Bluetooth Codec strings
in Developer Settings:
* Update the codec name "aptX-HD" -> "aptX HD" to reflect the vendor
defined writing:
https://www.aptx.com/aptx-hd
* Increase some of the "CHAR LIMIT" values for the purpose
of translation to other languages
* Update some of the text in the UI (for clarity)
* Added new string: "Streaming: " that is used in the UI summary
Test: UI visual observation
Bug: b/
34188102 b/
34206536 b/
34209576 b/
34210861 b/
34207126 b/
34211204
Bug: b/
34206992 b/
34210910 b/
34210162 b/
34205434 b/
34198432 b/
34186749
Bug: b/
34188141 b/
34188657 b/
34192932 b/
34188655
Change-Id: I9dc609594864b5d29394c49e0bce64416706c81c
Wei Liu [Mon, 23 May 2016 22:12:49 +0000 (15:12 -0700)]
SystemServer: cherry-pick p2p service start
Cherry-pick change that only starts P2P service if p2p is supported for
the device.
Disable WiFi p2p service if it's not supported.
b/
26877020
Bug:
34193861
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: manually verified wifi connection
Test: manually checked for p2p peers
Change-Id: I84b822fa57423711de75d2147effe73a1fc40eb4
Merged-In: I84b822fa57423711de75d2147effe73a1fc40eb4
Glen Kuhne [Wed, 18 Jan 2017 18:25:52 +0000 (18:25 +0000)]
Merge "Unhide WifiConfiguration proxy accessors" am:
c82d1ddaf4
am:
d2f5fd3c42
Change-Id: I20fbec10c7a3355d80a305583308095954ff5488
Glen Kuhne [Wed, 18 Jan 2017 18:20:43 +0000 (18:20 +0000)]
Merge "Unhide WifiConfiguration proxy accessors"
am:
c82d1ddaf4
Change-Id: I12e44cf9c75f76712eb2c89fbd878a7cb74ec8a9
Glen Kuhne [Wed, 18 Jan 2017 18:08:35 +0000 (18:08 +0000)]
Merge "Unhide WifiConfiguration proxy accessors"
Kenny Guy [Wed, 18 Jan 2017 17:47:03 +0000 (17:47 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed
am:
1894632864
Change-Id: I10ed70e5aef941dd7b31f381f78eb8418985f33c
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:34:58 +0000 (16:34 +0000)]
svc nfc should support watches too
am:
1876583bfb
Change-Id: I9612fbe232ecf883fda2c629438ed55ddb50c468
Jay [Wed, 18 Jan 2017 15:49:58 +0000 (15:49 +0000)]
Merge "Notify user switch event to NetworkController" am:
1aa24246cf
am:
4ab0e9f824
Change-Id: I51365e12797493e620e3146cc7e25eda8c2065c8
Jay [Wed, 18 Jan 2017 15:43:51 +0000 (15:43 +0000)]
Merge "Notify user switch event to NetworkController"
am:
1aa24246cf
Change-Id: I1c2cefbc0fff7d90a4c2a0314c3697ee198caab5
Treehugger Robot [Wed, 18 Jan 2017 15:32:27 +0000 (15:32 +0000)]
Merge "Notify user switch event to NetworkController"
Orion Hodson [Wed, 18 Jan 2017 13:13:55 +0000 (13:13 +0000)]
API: Unhide dalvik.system.InMemoryDexClassLoader
Bug:
26878838
Test: make docs
Change-Id: Ica969089dd82d1b610d6a307bb414690e736a1c7
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
Jason Monk [Wed, 18 Jan 2017 15:04:51 +0000 (10:04 -0500)]
Fix build
Test: treehugger
Change-Id: Ic33d5ff2d7845bf4edd81d3e966fce3f0e5956bb
Jason Monk [Wed, 18 Jan 2017 14:24:48 +0000 (14:24 +0000)]
Merge "SystemUI: Add NFC tile" am:
943a52862e
am:
8fbdf116d0
Change-Id: I114a75548444e409d1f72183589c886ca9fbccbd
Jason Monk [Wed, 18 Jan 2017 14:19:48 +0000 (14:19 +0000)]
Merge "SystemUI: Add NFC tile"
am:
943a52862e
Change-Id: Icf68f41a0b930da0b846a9b71da1121ef4987d56
Jason Monk [Wed, 18 Jan 2017 14:07:52 +0000 (14:07 +0000)]
Merge "SystemUI: Add NFC tile"
Tamas Berghammer [Wed, 18 Jan 2017 12:57:56 +0000 (12:57 +0000)]
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
Anas Karbila [Sat, 10 Dec 2016 23:55:02 +0000 (00:55 +0100)]
SystemUI: Add NFC tile
This patch adds a tile for QuickSettings
which controls the setting of NFC.
The drawable is from material.io.
Test: Enable and disable NFC using tile
Change-Id: I7dfaf3a4dca0c01d24be397e43ab131eb9885f62
Signed-off-by: Anas Karbila <anaskarbila@aospa.co>
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
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)
Przemyslaw Szczepaniak [Wed, 14 Dec 2016 15:45:39 +0000 (15:45 +0000)]
Track libcore java.util.logging update to ojdk8u60
Test: CtsLibcoreTestCases
Bug:
28666126
Change-Id: I3d8a7046e339a4a327e04574a4479fe2a1291d4c
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"
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
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"
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
OSDN Git Service
