OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Eschew unspecified IP addresses for DNS servers"
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

7 years agoMerge "Eschew unspecified IP addresses for DNS servers"
Treehugger Robot [Thu, 19 Jan 2017 09:38:26 +0000 (09:38 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers"

7 years agoEschew unspecified IP addresses for DNS servers
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

7 years agoMerge "Revert "RecoverySystem: Fix the issue in installPackage().""
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

7 years agoMerge "Revert "RecoverySystem: Fix the issue in installPackage().""
Tao Bao [Thu, 19 Jan 2017 01:47:09 +0000 (01:47 +0000)]
Merge "Revert "RecoverySystem: Fix the issue in installPackage().""

7 years agoRevert "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

7 years agoMerge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
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

7 years agoMerge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
Peng Xu [Thu, 19 Jan 2017 01:11:49 +0000 (01:11 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"

7 years agoMerge changes from topic 'kill_debuggerd'
Josh Gao [Wed, 18 Jan 2017 23:26:12 +0000 (23:26 +0000)]
Merge changes from topic 'kill_debuggerd'
am: cfb19e3ac8

Change-Id: I805db402362fd2d9822e3aaa0ed004431fccfd79

7 years agoSwitch android.os.Debug to libdebuggerd_client.
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

7 years agoapp_process: don't use PR_SET_NO_NEW_PRIVS.
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

7 years agoRemove peercred check from NativeCrashListener.
Josh Gao [Wed, 18 Jan 2017 23:17:40 +0000 (23:17 +0000)]
Remove peercred check from NativeCrashListener.
am: b9eb093c3c

Change-Id: If777f29a165862b652c293f3127d89e5adbbe145

7 years agoMerge changes from topic 'kill_debuggerd'
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.

7 years agoMerge "Update/cleanup Bluetooth Codec strings in Developer Settings"
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

7 years agoMerge "Update/cleanup Bluetooth Codec strings in Developer Settings"
Treehugger Robot [Wed, 18 Jan 2017 20:20:47 +0000 (20:20 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"

7 years agoUpdate/cleanup Bluetooth Codec strings in Developer Settings
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

7 years agoMerge "Unhide WifiConfiguration proxy accessors"
Glen Kuhne [Wed, 18 Jan 2017 18:20:43 +0000 (18:20 +0000)]
Merge "Unhide WifiConfiguration proxy accessors"
am: c82d1ddaf4

Change-Id: I12e44cf9c75f76712eb2c89fbd878a7cb74ec8a9

7 years agoMerge "Unhide WifiConfiguration proxy accessors"
Glen Kuhne [Wed, 18 Jan 2017 18:08:35 +0000 (18:08 +0000)]
Merge "Unhide WifiConfiguration proxy accessors"

7 years agoMerge "Notify user switch event to NetworkController"
Jay [Wed, 18 Jan 2017 15:43:51 +0000 (15:43 +0000)]
Merge "Notify user switch event to NetworkController"
am: 1aa24246cf

Change-Id: I1c2cefbc0fff7d90a4c2a0314c3697ee198caab5

7 years agoMerge "Notify user switch event to NetworkController"
Treehugger Robot [Wed, 18 Jan 2017 15:32:27 +0000 (15:32 +0000)]
Merge "Notify user switch event to NetworkController"

7 years agoMerge "SystemUI: Add NFC tile"
Jason Monk [Wed, 18 Jan 2017 14:19:48 +0000 (14:19 +0000)]
Merge "SystemUI: Add NFC tile"
am: 943a52862e

Change-Id: Icf68f41a0b930da0b846a9b71da1121ef4987d56

7 years agoMerge "SystemUI: Add NFC tile"
Jason Monk [Wed, 18 Jan 2017 14:07:52 +0000 (14:07 +0000)]
Merge "SystemUI: Add NFC tile"

7 years agoSystemUI: Add NFC tile
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>
7 years agoMerge "Add legacy-android-test target containing android.test classes"
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

7 years agoMerge "Add legacy-android-test target containing android.test classes"
Paul Duffin [Wed, 18 Jan 2017 11:19:57 +0000 (11:19 +0000)]
Merge "Add legacy-android-test target containing android.test classes"

7 years agoMerge "API: Unhide MethodHandles API (java.lang.invoke)."
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

7 years agoMerge "API: Unhide MethodHandles API (java.lang.invoke)."
Narayan Kamath [Wed, 18 Jan 2017 09:46:15 +0000 (09:46 +0000)]
Merge "API: Unhide MethodHandles API (java.lang.invoke)."

7 years agoMerge "Restore legacy types when registering mobile requests"
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

7 years agoMerge "Restore legacy types when registering mobile requests"
Treehugger Robot [Wed, 18 Jan 2017 09:34:36 +0000 (09:34 +0000)]
Merge "Restore legacy types when registering mobile requests"

7 years agoRestore 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

7 years agoMerge "Refactor PackageDexOptimizer"
Calin Juravle [Wed, 18 Jan 2017 04:06:14 +0000 (04:06 +0000)]
Merge "Refactor PackageDexOptimizer"
am: b3edbd7432

Change-Id: I6ecee9500002c977de497f598abfd8be081dd584

7 years agoMerge "Refactor PackageDexOptimizer"
Calin Juravle [Wed, 18 Jan 2017 03:59:19 +0000 (03:59 +0000)]
Merge "Refactor PackageDexOptimizer"

7 years agoMerge "PackageDexOptimizer: fix typo in log message."
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

7 years agoMerge "PackageDexOptimizer: fix typo in log message."
Treehugger Robot [Wed, 18 Jan 2017 03:42:46 +0000 (03:42 +0000)]
Merge "PackageDexOptimizer: fix typo in log message."

7 years agoRefactor PackageDexOptimizer
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

7 years agoPackageDexOptimizer: fix typo in log message.
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

7 years agoMerge "Only measure each UID once in InstallerTest."
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

7 years agoMerge "Only measure each UID once in InstallerTest."
Jeff Sharkey [Wed, 18 Jan 2017 01:10:59 +0000 (01:10 +0000)]
Merge "Only measure each UID once in InstallerTest."

7 years agoUnhide WifiConfiguration proxy accessors
Glen Kuhne [Wed, 23 Nov 2016 00:25:08 +0000 (16:25 -0800)]
Unhide WifiConfiguration proxy accessors

Unhiding HttpProxy accessors in WifiConfiguration.
This change occurs in parrallel with changes that restrict updating of
WifiConfigurations with new or updated proxy info to uids
holding permission OVERRIDE_WIFI_CONFIG, or holding DeviceOwner or
ProfileOwner policies.

Bug: 14669153
Test: None
Change-Id: Id69525cfec152ea52697693f9a3bd6f86019c694
Merged-In: Id69525cfec152ea52697693f9a3bd6f86019c694

7 years agoOnly measure each UID once in InstallerTest.
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

7 years agoSwitch android.os.Debug to libdebuggerd_client.
Josh Gao [Fri, 6 Jan 2017 02:28:24 +0000 (18:28 -0800)]
Switch android.os.Debug to libdebuggerd_client.

Bug: http://b/30705528
Test: m
Change-Id: Iac3860d0e63660b91a4b08075fca8a4a222ac913

7 years agoapp_process: don't use PR_SET_NO_NEW_PRIVS.
Josh Gao [Tue, 3 Jan 2017 21:29:03 +0000 (13:29 -0800)]
app_process: don't use PR_SET_NO_NEW_PRIVS.

selinux should provide equivalent protection, and this prevents
transitioning to a helper binary for crash dumping.

Bug: http://b/30705528
Change-Id: I64b05236931d418f268b193418e937ab6b0985e0

7 years agoRemove peercred check from NativeCrashListener.
Josh Gao [Fri, 4 Nov 2016 22:22:02 +0000 (15:22 -0700)]
Remove peercred check from NativeCrashListener.

crash_dump will be running as the user of the process that crashed. Use
selinux to restrict access instead.

Bug: http://b/30705528
Change-Id: Ief69b16499d9cb56b120d58eca8db511b521a11a

7 years agoAdd legacy-android-test target containing android.test classes
Paul Duffin [Tue, 17 Jan 2017 14:36:12 +0000 (14:36 +0000)]
Add legacy-android-test target containing android.test classes

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 a
legacy-android-test target, containing only the android.test
classes, for use by any targets that depend on those classes.

Bug: 30188076
Test: make checkbuild
Change-Id: Ifc0a9a23d4ac3c78428bb9dde38e547e6978ba7e

7 years agoMerge "Add getNetworkSpecifier() and getCarrierConfig()"
Ta-wei Yen [Tue, 17 Jan 2017 19:47:24 +0000 (19:47 +0000)]
Merge "Add getNetworkSpecifier() and getCarrierConfig()"
am: 68d03b23bb

Change-Id: Ib4cf1d7f986a5ed4cc761f9abc10609de0bd22ff

7 years agoMerge "Add getNetworkSpecifier() and getCarrierConfig()"
Ta-wei Yen [Tue, 17 Jan 2017 19:38:26 +0000 (19:38 +0000)]
Merge "Add getNetworkSpecifier() and getCarrierConfig()"

7 years agoMerge "Keep WIFI_FEATURE defines in sync with HAL"
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

7 years agoMerge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a"
Przemyslaw Szczepaniak [Tue, 17 Jan 2017 18:26:57 +0000 (18:26 +0000)]
Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a"
am: 751e3af81e

Change-Id: I6c0ebb09325ab2f37469c9d4a5408f812380efc1

7 years agoMerge "Keep WIFI_FEATURE defines in sync with HAL"
Randy Pan [Tue, 17 Jan 2017 18:10:01 +0000 (18:10 +0000)]
Merge "Keep WIFI_FEATURE defines in sync with HAL"

7 years agoMerge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a"
Treehugger Robot [Tue, 17 Jan 2017 17:55:16 +0000 (17:55 +0000)]
Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a"

7 years agoAPI: Unhide MethodHandles API (java.lang.invoke).
Narayan Kamath [Tue, 17 Jan 2017 12:55:57 +0000 (12:55 +0000)]
API: Unhide MethodHandles API (java.lang.invoke).

Tracks libcore change 58a12375dd5c2dc721f8d0433b5cb11737bc349d.

Test: make docs
Change-Id: I6e35fef1078d3c26a56bcea79eb2a3e993ca8714

7 years agoMerge "API: Update java.util.Date to OpenJDK8u60"
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

7 years agoMerge "API: Update java.util.Date to OpenJDK8u60"
Tobias Thierer [Tue, 17 Jan 2017 10:41:34 +0000 (10:41 +0000)]
Merge "API: Update java.util.Date to OpenJDK8u60"

7 years agoMerge "Delete dead code."
Lorenzo Colitti [Tue, 17 Jan 2017 05:55:50 +0000 (05:55 +0000)]
Merge "Delete dead code."
am: cf59ff79c5

Change-Id: Ifbb591a7bbed9c2a8f83fe321c3d12f08e096fe3

7 years agoMerge "Delete dead code."
Treehugger Robot [Tue, 17 Jan 2017 05:44:57 +0000 (05:44 +0000)]
Merge "Delete dead code."

7 years agoMerge "Move tests added in n-mr2 into new aosp location."
Erik Kline [Tue, 17 Jan 2017 05:01:52 +0000 (05:01 +0000)]
Merge "Move tests added in n-mr2 into new aosp location."
am: 5511f7cfc2

Change-Id: I30161c31529fc0c5254353f4329cbd5165fcbd82

7 years agoMove tests added in n-mr2 into new aosp location.
Erik Kline [Tue, 17 Jan 2017 05:01:49 +0000 (05:01 +0000)]
Move tests added in n-mr2 into new aosp location.
am: e446acf954

Change-Id: I69c76aaf4c8d03ce4b33d9c16c47f2c83141e255

7 years agoMerge "Move tests added in n-mr2 into new aosp location."
Treehugger Robot [Tue, 17 Jan 2017 04:49:07 +0000 (04:49 +0000)]
Merge "Move tests added in n-mr2 into new aosp location."

7 years agoMerge "Start of UpstreamNetworkMonitor unittests"
Erik Kline [Tue, 17 Jan 2017 04:46:17 +0000 (04:46 +0000)]
Merge "Start of UpstreamNetworkMonitor unittests"
am: f9a28d7ba4

Change-Id: I2dade79427530a04c8e222e4ab2bf26e79ddd578

7 years agoMerge "Start of UpstreamNetworkMonitor unittests"
Treehugger Robot [Tue, 17 Jan 2017 04:38:21 +0000 (04:38 +0000)]
Merge "Start of UpstreamNetworkMonitor unittests"

7 years agoMerge "Enable mobile data always on."
Lorenzo Colitti [Tue, 17 Jan 2017 04:25:44 +0000 (04:25 +0000)]
Merge "Enable mobile data always on."
am: 6e4fe6b37f

Change-Id: I9758da5105b9a8eac66aaaf9e4a1658685a6a3f7

7 years agoMerge "Enable mobile data always on."
Treehugger Robot [Tue, 17 Jan 2017 04:15:33 +0000 (04:15 +0000)]
Merge "Enable mobile data always on."

7 years agoStart of UpstreamNetworkMonitor unittests
Erik Kline [Mon, 16 Jan 2017 07:27:22 +0000 (16:27 +0900)]
Start of UpstreamNetworkMonitor unittests

Test only the ConnectivityManager request and callback registering
and releasing.  Testing behaviour triggered by activating these
callbacks will be in a separate change.

Test: runtest frameworks-net
Bug: 32163131
Change-Id: Ibfe66bbe2e61d81e8f13ac3b98e000d0d4534efa

7 years agoEnable mobile data always on.
Lorenzo Colitti [Tue, 17 Jan 2017 02:07:10 +0000 (11:07 +0900)]
Enable mobile data always on.

Test: has been on in fishfood several months.
Bug: 23113288
Change-Id: I73ba432f619d28dab78e2d865d56aa7e7c5a67f9

7 years agoMerge "RecoverySystem: Fix the issue in installPackage()."
Tao Bao [Mon, 16 Jan 2017 18:27:39 +0000 (18:27 +0000)]
Merge "RecoverySystem: Fix the issue in installPackage()."
am: 3b2fe9f7b9

Change-Id: I2ac84a2204b78e422d33095a3637e379031eec04

7 years agoMerge "RecoverySystem: Fix the issue in installPackage()."
Tao Bao [Mon, 16 Jan 2017 18:19:25 +0000 (18:19 +0000)]
Merge "RecoverySystem: Fix the issue in installPackage()."

7 years agoMerge "VPN reconnection fails after manually disabling VPN"
Hisanobu Watanabe [Mon, 16 Jan 2017 17:59:55 +0000 (17:59 +0000)]
Merge "VPN reconnection fails after manually disabling VPN"
am: ba17ea752b

Change-Id: I8ff02f8d1fe4989cb92949ab85aade598c8cff00

7 years agoMerge "Make TelephonyManager.getImei a system APIs."
Polina Bondarenko [Mon, 16 Jan 2017 17:57:04 +0000 (17:57 +0000)]
Merge "Make TelephonyManager.getImei a system APIs."
am: dc61ad0ad8

Change-Id: Iaffe54fdf263eaf1cc248ceb0dad9b8787861475

7 years agoMerge "VPN reconnection fails after manually disabling VPN"
Treehugger Robot [Mon, 16 Jan 2017 17:51:04 +0000 (17:51 +0000)]
Merge "VPN reconnection fails after manually disabling VPN"

7 years agoMerge "Make TelephonyManager.getImei a system APIs."
Treehugger Robot [Mon, 16 Jan 2017 17:49:58 +0000 (17:49 +0000)]
Merge "Make TelephonyManager.getImei a system APIs."

7 years agoTrack libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a
Przemyslaw Szczepaniak [Mon, 16 Jan 2017 17:21:17 +0000 (17:21 +0000)]
Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a

Test: CtsLibcoreTestCases
Bug: 30964930
Change-Id: Ia3cacc2256c5fd84c97eb50d52ebf23d3181a8ba

7 years agoMerge "Add nullable parameter to readEmbeddedBuffer."
Martijn Coenen [Mon, 16 Jan 2017 14:56:57 +0000 (14:56 +0000)]
Merge "Add nullable parameter to readEmbeddedBuffer."
am: c5e5442acd

Change-Id: Ic5d73aba5da7bd74522a46d710465ebb67030d01

7 years agoMerge "Add nullable parameter to readEmbeddedBuffer."
Martijn Coenen [Mon, 16 Jan 2017 14:48:09 +0000 (14:48 +0000)]
Merge "Add nullable parameter to readEmbeddedBuffer."

7 years agoMove tests added in n-mr2 into new aosp location.
Erik Kline [Fri, 16 Dec 2016 07:19:34 +0000 (16:19 +0900)]
Move tests added in n-mr2 into new aosp location.

Test: runtest frameworks-net
Change-Id: I3ca0d7e01a3f31be05d4a1a72a95c7e37a0a567e

7 years agoMerge "Extract UpstreamNetworkMonitor to its own file"
Erik Kline [Mon, 16 Jan 2017 05:47:06 +0000 (05:47 +0000)]
Merge "Extract UpstreamNetworkMonitor to its own file"
am: 8df5bd1028

Change-Id: I7973c74952efb1abe9309eedfdf829af39467463

7 years agoMerge "Extract UpstreamNetworkMonitor to its own file"
Treehugger Robot [Mon, 16 Jan 2017 05:36:05 +0000 (05:36 +0000)]
Merge "Extract UpstreamNetworkMonitor to its own file"

7 years agoMerge "ConnectivityServiceTest: some fixes in CallbackInfo"
Hugo Benichi [Mon, 16 Jan 2017 05:00:30 +0000 (05:00 +0000)]
Merge "ConnectivityServiceTest: some fixes in CallbackInfo"
am: 37727596cc

Change-Id: I636b7b0ef210aaa3e130e1c1a162a35cdc099295

7 years agoMerge "ConnectivityServiceTest: some fixes in CallbackInfo"
Treehugger Robot [Mon, 16 Jan 2017 04:52:44 +0000 (04:52 +0000)]
Merge "ConnectivityServiceTest: some fixes in CallbackInfo"

7 years agoExtract UpstreamNetworkMonitor to its own file
Erik Kline [Fri, 13 Jan 2017 07:46:52 +0000 (16:46 +0900)]
Extract UpstreamNetworkMonitor to its own file

Test: as follows:
    - built (bullhead)
    - flashed
    - booted
    - runtest framworks-net passes
Bug: 32163131

Change-Id: I87ff041e008e45065c9722de8130df53684fb2a9

7 years agoConnectivityServiceTest: some fixes in CallbackInfo
Hugo Benichi [Tue, 20 Dec 2016 08:05:06 +0000 (17:05 +0900)]
ConnectivityServiceTest: some fixes in CallbackInfo

- CallbackInfo becomes a static class so that it can be instantiated
  and looked at more easily than before.
- CallbackInfo gains hashCode() because it has equals().
- effectively final field are qualified final
- fixes bug when polling the next callback: poll() on a LinkedBlockingQueue
  returns null when timing out, which was not failing the test cleanly.

Test: ConnectivityServiceTest passes
Bug: 32561414
Change-Id: I64d382a35fe83f21bded98e6906c1ec70a8f1085

7 years agoMerge "BBinder -> BHwBinder."
Yifan Hong [Sat, 14 Jan 2017 00:55:55 +0000 (00:55 +0000)]
Merge "BBinder -> BHwBinder."
am: fe4d257887

Change-Id: Iefe63e614d5c90f33d807aba8fac3f2095972ae8

7 years agoMerge "BBinder -> BHwBinder."
Yifan Hong [Sat, 14 Jan 2017 00:49:22 +0000 (00:49 +0000)]
Merge "BBinder -> BHwBinder."

7 years agoAdd getNetworkSpecifier() and getCarrierConfig()
Ta-wei Yen [Thu, 29 Dec 2016 23:29:13 +0000 (15:29 -0800)]
Add getNetworkSpecifier() and getCarrierConfig()

This allows making network request and getting carrier config on a
specfic SIM.

Bug: 32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Merged-In: Id52688d73b74bc55ee2da71a22454957fdd7b57b
Change-Id: Iebe2d883e193afdde13303d76014dfd7f4fb06dd

7 years agoKeep WIFI_FEATURE defines in sync with HAL
Randy Pan [Fri, 13 Jan 2017 18:45:46 +0000 (10:45 -0800)]
Keep WIFI_FEATURE defines in sync with HAL

Bug: 33673826
Test: build
Change-Id: Ifec7b28ef7b08a478d889d40d13b45f3a60a7e07

7 years agoAPI: Update java.util.Date to OpenJDK8u60
Tobias Thierer [Fri, 13 Jan 2017 21:52:22 +0000 (21:52 +0000)]
API: Update java.util.Date to OpenJDK8u60

Test: make update-api
Change-Id: I116e13977427e714c6dbe4a843687220fd18a043

7 years agoRecoverySystem: Fix the issue in installPackage().
Tao Bao [Fri, 13 Jan 2017 17:45:14 +0000 (09:45 -0800)]
RecoverySystem: Fix the issue in installPackage().

Commit 794c8b0b3fe16051843c22232d58d6b184dde49b fixed the race condition
when requesting data wipes via uncrypt. We have similar issue with
RecoverySystem.installPackage(). It first requests to set up the BCB,
then triggers a reboot. These two steps should finish atomically.

This CL switches to calling
RecoverySystemService.rebootRecoveryWithCommand(), which guards the two
steps with synchronized blocks.

Bug: 34239871
Test: Having two apps: one calls RecoverySystem.cancelScheduledUpdate()
      continuously, and the other calls RecoverySystem.installPackage()
      just once. The install request should not be cancelled by the
      other.

Change-Id: I5ec56fcaa70eae7c33e3cc8e6cfc7472b935ce4e

7 years agoAdd nullable parameter to readEmbeddedBuffer.
Martijn Coenen [Fri, 13 Jan 2017 10:08:51 +0000 (11:08 +0100)]
Add nullable parameter to readEmbeddedBuffer.

To support reading embedded buffers that can be
nullptr (currently only in empty hidl_vec).

Bug: 34255213
Test: hidl_test_java
Change-Id: I72028f580b7863b6bfeb31a5c0f43deed36dfd64

7 years agoMerge "Add java.time APIs."
Joachim Sauer [Fri, 13 Jan 2017 10:27:05 +0000 (10:27 +0000)]
Merge "Add java.time APIs."
am: 0938b22c0a

Change-Id: Ie1169d1af12228ac63f43efdf7f18e7dcb705bee

7 years agoMerge "Add java.time APIs."
Joachim Sauer [Fri, 13 Jan 2017 10:18:18 +0000 (10:18 +0000)]
Merge "Add java.time APIs."

7 years agoMerge "Move explicit mobile request handling into UpstreamNetworkMonitor"
Erik Kline [Fri, 13 Jan 2017 07:11:47 +0000 (07:11 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor"
am: caf62d305e

Change-Id: I8befc4b903289a21cfdcdaa16bbaeff7e9247892

7 years agoMove explicit mobile request handling into UpstreamNetworkMonitor
Erik Kline [Fri, 13 Jan 2017 07:11:43 +0000 (07:11 +0000)]
Move explicit mobile request handling into UpstreamNetworkMonitor
am: fdd4111ef6

Change-Id: If452982fdc47cf0e655c7f079c1be3f535ec6c03

7 years agoMerge "Move explicit mobile request handling into UpstreamNetworkMonitor"
Treehugger Robot [Fri, 13 Jan 2017 07:03:16 +0000 (07:03 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor"

7 years agoMove explicit mobile request handling into UpstreamNetworkMonitor
Erik Kline [Thu, 12 Jan 2017 08:02:51 +0000 (17:02 +0900)]
Move explicit mobile request handling into UpstreamNetworkMonitor

Also:
    - some minor typo fixes
    - some minor style fixes
    - variable renames for clarity

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - regular (no DUN) wifi tethering to mobile works
    - USB tethering with switching between mobile and wifi works
Bug: 32163131
Change-Id: I113536f24436f0b962f402f3b37386e29468dc0a

7 years agoMerge "Default Carrier app for traffic mitigation"
Chen Xu [Fri, 13 Jan 2017 02:28:28 +0000 (02:28 +0000)]
Merge "Default Carrier app for traffic mitigation"
am: 4533b1ccdd

Change-Id: I999285660c3a53fb2da8f18ddde9042f611f4e96

7 years agoMerge "Default Carrier app for traffic mitigation"
Chen Xu [Fri, 13 Jan 2017 02:22:38 +0000 (02:22 +0000)]
Merge "Default Carrier app for traffic mitigation"

7 years agoDefault Carrier app for traffic mitigation
fionaxu [Wed, 14 Dec 2016 01:15:11 +0000 (17:15 -0800)]
Default Carrier app for traffic mitigation

- have the basic function working, support traffic mitigation and
  captive portal login
- support carrier customization, OEM could configure a list of carrier
  actions to act upon certain signals
- unit test

Test: Manual test with live sim card & runtest --path
frameworks/base/packages/CarrierDefaultApp
Bug: 30958215

Change-Id: Ie99be3b95e8a1dd60fc51bef703836478fbde09d

7 years agoMerge "Add support for FDN contact dial"
Robert Greenwalt [Thu, 12 Jan 2017 23:12:23 +0000 (23:12 +0000)]
Merge "Add support for FDN contact dial"
am: 082b118641

Change-Id: Ib7896cc64ea560338e7b737145eb7f96b4e89efc

7 years agoMerge "Add support for FDN contact dial"
Robert Greenwalt [Thu, 12 Jan 2017 23:06:59 +0000 (23:06 +0000)]
Merge "Add support for FDN contact dial"

7 years agoBBinder -> BHwBinder.
Yifan Hong [Thu, 12 Jan 2017 22:20:31 +0000 (14:20 -0800)]
BBinder -> BHwBinder.

Test: mma
Test: croot && make

Bug: 33554989
Change-Id: I76ec5cd29fc510ba5b518f59dd83a38ad6675418

7 years agoMerge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""
Andre Eisenbach [Thu, 12 Jan 2017 16:27:03 +0000 (16:27 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""
am: 0b9a18d21e

Change-Id: I245966c53c49da6c0b95b73ec72754d85edcd627