OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "PackageManager: Clean up code related to foreign dex use"
Calin Juravle [Tue, 7 Mar 2017 21:13:14 +0000 (21:13 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use"

7 years agoPackageManager: Clean up code related to foreign dex use
Calin Juravle [Sat, 4 Mar 2017 01:04:55 +0000 (17:04 -0800)]
PackageManager: Clean up code related to foreign dex use

We simplified the way we track whether or not a dex file is used by
other apps. DexManager in the framework keeps track of the data and we
no longer need file markers on disk.

Test: device boots, foreign dex markers are not created anymore

Bug: 32871170

(cherry picked from commit 74f0a3450cd598f52b2c68c43531b1a27fb4e1ce)

Change-Id: I2a9daca15e5120518852584fa17aa94012af8f1a
Merged-In: I3660e2f3913a73904181449c2d910af0a0477950

7 years agoMerge "Framework: Ensure image heap string literals for Patterns"
Treehugger Robot [Tue, 7 Mar 2017 16:50:58 +0000 (16:50 +0000)]
Merge "Framework: Ensure image heap string literals for Patterns"

7 years agoMerge "[CM] Allow timeout in request network"
Etan Cohen [Tue, 7 Mar 2017 16:40:26 +0000 (16:40 +0000)]
Merge "[CM] Allow timeout in request network"

7 years agoMerge "Track: ICU TimeZone: publish TIMEZONE_* constants"
Tobias Thierer [Tue, 7 Mar 2017 16:35:17 +0000 (16:35 +0000)]
Merge "Track: ICU TimeZone: publish TIMEZONE_* constants"

7 years agoMerge "request{LinkProperties,NetworkCapabilities} no longer needed"
Treehugger Robot [Tue, 7 Mar 2017 13:27:09 +0000 (13:27 +0000)]
Merge "request{LinkProperties,NetworkCapabilities} no longer needed"

7 years agorequest{LinkProperties,NetworkCapabilities} no longer needed
Erik Kline [Tue, 7 Mar 2017 06:25:32 +0000 (15:25 +0900)]
request{LinkProperties,NetworkCapabilities} no longer needed

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering toggling between WiFi and mobile
Bug: 32163131
Change-Id: I57edf5114b6361f320577c7870e40f8b3cdf74ce

7 years agoMerge "Handle null NetworkState updates"
Treehugger Robot [Tue, 7 Mar 2017 06:24:16 +0000 (06:24 +0000)]
Merge "Handle null NetworkState updates"

7 years agoMerge "Always send all available state when calling onAvailable()."
Treehugger Robot [Tue, 7 Mar 2017 05:51:40 +0000 (05:51 +0000)]
Merge "Always send all available state when calling onAvailable()."

7 years agoHandle null NetworkState updates
Erik Kline [Tue, 7 Mar 2017 04:17:39 +0000 (13:17 +0900)]
Handle null NetworkState updates

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering to WiFi and mobile switching works
Bug: 32163131
Change-Id: I2d4ef7c135ae6eb50cc31236f2fd20080536ea6a

7 years agoAlways send all available state when calling onAvailable().
Erik Kline [Wed, 15 Feb 2017 10:59:17 +0000 (19:59 +0900)]
Always send all available state when calling onAvailable().

The state that needs to be transferred includes:
    - NetworkCapabilities
    - LinkProperties
    - whether the network is currently suspended

Additionally:
    - Rename notifyNetworkCallback() to notifyNetworkAvailable()
      in order to clarify its real function.
    - fix previous copy/paste error in unittest

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - USB tethering with mobile and Wi-Fi upstream toggling
Bug: 32163131
Change-Id: Ib4460bcd5d08863a9feac9e8ab41a238897bb3ea

7 years agoMerge "API review cleanups/changes."
Tyler Gunn [Tue, 7 Mar 2017 01:55:58 +0000 (01:55 +0000)]
Merge "API review cleanups/changes."

7 years agoMerge "nfc: First chunked NDEF record of TNF doesn't contain the type field"
Treehugger Robot [Tue, 7 Mar 2017 01:27:17 +0000 (01:27 +0000)]
Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field"

7 years agoMerge "Start of tethering OffloadController"
Treehugger Robot [Tue, 7 Mar 2017 01:00:55 +0000 (01:00 +0000)]
Merge "Start of tethering OffloadController"

7 years agoMerge "BluetoothManagerService: continue teardown when BLE apps registered"
Andre Eisenbach [Mon, 6 Mar 2017 21:25:40 +0000 (21:25 +0000)]
Merge "BluetoothManagerService: continue teardown when BLE apps registered"

7 years agoBluetoothManagerService: continue teardown when BLE apps registered
Martin Brabham [Tue, 28 Feb 2017 00:55:07 +0000 (16:55 -0800)]
BluetoothManagerService: continue teardown when BLE apps registered

    When the adapter is toggled off; when there are BLE apps registered, a
request is sent to unregister all of the BLE apps.  Upon unregister each app
will call through to this function via a callback.  When this gets called if
the ble app count is 0, we can disable everything.  I am keeping track of the
flag so that we know explicitly where we are coming from.

Bug: 34707848
Test: Compile
Change-Id: I9a8322a6fa918e7b410770894c257ec9f7d8d1f5

7 years agoMerge "Removed close guards for Element and Type objects"
Yang Ni [Mon, 6 Mar 2017 21:25:29 +0000 (21:25 +0000)]
Merge "Removed close guards for Element and Type objects"

7 years agonfc: First chunked NDEF record of TNF doesn't contain the type field
Ruchi Kandoi [Fri, 3 Feb 2017 22:01:09 +0000 (14:01 -0800)]
nfc: First chunked NDEF record of TNF doesn't contain the type field

Test: CTS test passes
Bug: 34943312
Change-Id: I08f37ee76810f642b35ae8bde05ef0e2eff921e0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
7 years agoMerge "Check for spurious wake ups"
Tom Cherry [Mon, 6 Mar 2017 19:25:58 +0000 (19:25 +0000)]
Merge "Check for spurious wake ups"

7 years agoAPI review cleanups/changes.
Tyler Gunn [Thu, 2 Mar 2017 17:28:37 +0000 (09:28 -0800)]
API review cleanups/changes.

- Change onCreateIncomingConnectionFailed/onCreateOutgoingConnectionFailed
to accept the connection mgr phone account as the first parameter.
- For the video APIs, pass the target SDK of the caller into along so
that the Telecom permission check can have fallback behavior for older API
versions.
- Add guidance for how UX should be shown in onShowIncomingCallUi API.
API guidance follows how the Dialer app shows its notification and full
screen UX.

Test: Manual, CTS.
Bug: 35767711
Bug: 35767096
Change-Id: Ib343f0eda1a4d067a38c553f33f140b4efcf3e48

7 years agoMerge "Bluetooth: Use content observer for airplane mode"
Treehugger Robot [Mon, 6 Mar 2017 17:59:02 +0000 (17:59 +0000)]
Merge "Bluetooth: Use content observer for airplane mode"

7 years agoBluetooth: Use content observer for airplane mode
Ajay Panicker [Wed, 22 Feb 2017 20:23:15 +0000 (12:23 -0800)]
Bluetooth: Use content observer for airplane mode

We are making this switch as the airplane mode switch intent is going away.

Fix: 35256299
Test: Toggle Airplane Mode
Change-Id: I3b1e5bbdf689b0db98cfbb0ab377198d34f0ba05

7 years agoMerge "Revert "ConnectivityManager: no double NetworkCallback registration" because...
Hugo Benichi [Mon, 6 Mar 2017 12:20:40 +0000 (12:20 +0000)]
Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions b/35955593, http://b/35921499."

7 years agoStart of tethering OffloadController
Erik Kline [Mon, 6 Mar 2017 05:05:23 +0000 (14:05 +0900)]
Start of tethering OffloadController

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Change-Id: If8f7df069f37f1b3d440d446ab1b160a52ba9e09

7 years agoRevert "ConnectivityManager: no double NetworkCallback registration" because oit...
Hugo Benichi [Mon, 6 Mar 2017 06:16:51 +0000 (06:16 +0000)]
Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions b/35955593, http://b/35921499.

This reverts commit faa70976b490116323107166f90fdd944c5bdc77.

Change-Id: I86c07c113f24753be7c977e6d7f570b99391e1b5

7 years agoMerge "Make seccomp honor setenforce"
Treehugger Robot [Sat, 4 Mar 2017 02:08:53 +0000 (02:08 +0000)]
Merge "Make seccomp honor setenforce"

7 years agoMake seccomp honor setenforce
Paul Lawrence [Fri, 3 Mar 2017 21:04:35 +0000 (13:04 -0800)]
Make seccomp honor setenforce

Note: This code is in frameworks, since we might want to have tools
linked against seccomp_policy that continue to enforce seccomp

Bug: 35950093
Test: Builds, Seccomp: 2 is in zygote & zygote64 status
      Run setenforce 0 && stop && start
      Seccomp: 0 is in zygote & zygote64 status

Change-Id: I797a6c29f58725f84089c570f784125fb99f57ce

7 years agoMerge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork"
Treehugger Robot [Fri, 3 Mar 2017 19:02:27 +0000 (19:02 +0000)]
Merge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork"

7 years agoRemoved close guards for Element and Type objects
Yang Ni [Fri, 3 Mar 2017 18:00:07 +0000 (10:00 -0800)]
Removed close guards for Element and Type objects

Bug: 28053769

These objects are tiny and unlikely to cause memory issues.

In addition, llvm-rs-cc auto-generated code contains such objects, which are
not visibible to developers and impossible to manually destroy, leaving
distracting warnings in Strict Mode.

Test: RsTest with StrictMode on and CTS tests

Change-Id: Iec68cca4f1259124b9f503a230c1a28b97ede1f3

7 years agoFramework: Ensure image heap string literals for Patterns
Andreas Gampe [Fri, 3 Mar 2017 17:38:58 +0000 (09:38 -0800)]
Framework: Ensure image heap string literals for Patterns

Do not use Pattern.toString to construct complex patterns. Instead,
make the string literals explicit so they can be compile-time
allocated, thus ending up as clean memory in the image heap.

Bug: 34956610
Test: m
Test: Device boots
Change-Id: I20d45c31243af00168553c218f75fb0795b55149

7 years agoMerge "Move value for the Build.CUR_DEVELOPMENT constant into libcore"
Tobias Thierer [Fri, 3 Mar 2017 12:02:09 +0000 (12:02 +0000)]
Merge "Move value for the Build.CUR_DEVELOPMENT constant into libcore"

7 years agoMerge "fd_utils: switch to libbase logging."
Narayan Kamath [Fri, 3 Mar 2017 10:59:23 +0000 (10:59 +0000)]
Merge "fd_utils: switch to libbase logging."

7 years agoMerge "fd_utils: add missing logging for a couple of failure cases."
Narayan Kamath [Fri, 3 Mar 2017 10:34:36 +0000 (10:34 +0000)]
Merge "fd_utils: add missing logging for a couple of failure cases."

7 years agoMerge changes from topic 'secondary-dex1'
Calin Juravle [Fri, 3 Mar 2017 03:42:33 +0000 (03:42 +0000)]
Merge changes from topic 'secondary-dex1'

* changes:
  Use DexManager logic to decide if a package is used by other apps
  Skip class path checking for secondary dex files

7 years agoUse DexManager logic to decide if a package is used by other apps
Calin Juravle [Thu, 2 Mar 2017 03:55:35 +0000 (19:55 -0800)]
Use DexManager logic to decide if a package is used by other apps

Stop relying on the file marker recorded by the runtime. We have the
same data available from the DexManager.

The clean up CL to remove the handling of the file markers will follow.

Test: verify that "shared packages" (e.g. gmscore) are not compiled with speed-profile.

Bug: 32871170

(cherry picked from commit 07b6eabe79261267ecd7114790e96e1f6828672a)

Change-Id: I2969b75fa77d38dde0073ef67aa89b1dc91237b5

Merged-In: I6cc5834ac88489e69896cd5fba9ed9968aa7f5a2

7 years agoSkip class path checking for secondary dex files
Calin Juravle [Wed, 15 Feb 2017 01:53:13 +0000 (17:53 -0800)]
Skip class path checking for secondary dex files

Pass '&' marker to dex2oat classpath when compiling secondary dex files.
This will skip class path checking when loading the oat files.

Test: adb shell cmd package compile -m speed -f --secondary-dex com.google.android.gms
      oatdump --header-only --oat-
file=/data/user/0/com.google.android.gms/app_chimera/m/00000006/oat/arm64/DynamiteModulesC_GmsCore_prodmnc_alldpi_release
      check that the class path contains the special '&' marker

Bug: 32871170

(cherry picked from commit aae35767b6bca6f872c906a0fd38d7adb61217bd)

Change-Id: I7f3c6743e749316ee02e8586a525ad28ae1ef765

Merged-In: If0628aeb4e3f5717604bfc4a87a4b1d438e5fa65

7 years agoMerge "Remove the name length limit for system properties."
Elliott Hughes [Fri, 3 Mar 2017 00:22:30 +0000 (00:22 +0000)]
Merge "Remove the name length limit for system properties."

7 years agoMerge changes from topic 'secondary-dex'
Calin Juravle [Thu, 2 Mar 2017 23:54:22 +0000 (23:54 +0000)]
Merge changes from topic 'secondary-dex'

* changes:
  Fix typo in dexopt.secondary system property
  Save package dex usage info after secondary dex reconciliation
  Compile secondary dex files during background dexopt job
  Add a shell command to force the background dexopt job
  A bit more refactoring in BackgroundDexOptService
  [PM] Clean up logic for secondary dex oat files
  Compile secondary dex files in DexManager
  Notify DexManager about new package installs

7 years agoRemove the name length limit for system properties.
Elliott Hughes [Thu, 2 Mar 2017 02:47:56 +0000 (18:47 -0800)]
Remove the name length limit for system properties.

Bug: http://b/33926793
Test: builds
Change-Id: Ib89b66b7abebc9a28961a0c9032b99947e3db0d6
Merged-In: Ib89b66b7abebc9a28961a0c9032b99947e3db0d6

7 years agoMerge "hotspot2: expose string constants for cert type and auth methods"
Treehugger Robot [Thu, 2 Mar 2017 22:11:00 +0000 (22:11 +0000)]
Merge "hotspot2: expose string constants for cert type and auth methods"

7 years agoFix typo in dexopt.secondary system property
Calin Juravle [Tue, 7 Feb 2017 19:09:01 +0000 (11:09 -0800)]
Fix typo in dexopt.secondary system property

Test: adb shell cmd package bg-dexopt-job
Bug: 32871170

(cherry picked from commit 4466c5ad84e4429284b7d5e13ad8a87c924ea7fc)

Change-Id: Ibfe3111198877ed0d758b68be89afb23c4756053

Merged-In: Ic8a14a3fc5c9aa63f6cb376f337b5bf459997325

7 years agoSave package dex usage info after secondary dex reconciliation
Calin Juravle [Fri, 27 Jan 2017 02:53:23 +0000 (18:53 -0800)]
Save package dex usage info after secondary dex reconciliation

Bug: 1833991
Test: add a bogus entry to /syste/data/package-dex-usage.list
      adb shell cmd package reconcile-secondary-dex-files
com.android.google.gms
      wait a bit and check the bogus entry is gone

(cherry picked from commit b1097411028103b6c88ce325af23d2ff1ec746c8)

Change-Id: I23248b11ea07bceb6527f55bf62618d1b2c3d83d

Merged-In: Ic07126bfb8730933081a5e010e3c357d338786e8

7 years agoCompile secondary dex files during background dexopt job
Calin Juravle [Thu, 26 Jan 2017 02:00:05 +0000 (18:00 -0800)]
Compile secondary dex files during background dexopt job

Extend the backgound dexopt job to compile secondary dex files when
"dalvik.vm.deopt.secondary" system property is set to true.

Test: adb shell cmd package bg-dexopt-job
Bug: 32871170

(cherry picked from commit 51f521c3bf46e6040f36757bc53ea57ddc7be85e)

Change-Id: I220ff4ea26c4eee030ab1a9f4c957a09aa9f2f4c

Merged-In: If3a4b77f785e92c7f2f7869e25ff9b99904f165a

7 years agoAdd a shell command to force the background dexopt job
Calin Juravle [Thu, 26 Jan 2017 01:16:08 +0000 (17:16 -0800)]
Add a shell command to force the background dexopt job

Add 'bg-dexopt-job' command to 'adb shell cmd package' which will force
the background  dexopt job to run the optimizations immediately.

Note that the command only runs the background optimizer logic. It may
overlap with the actual job but the job scheduler will not be able to
cancel it. It will also run even if the device is not in the idle
maintenance mode.

Test: adb shell cmd package bg-dexopt-job
Bug: 32871170

(cherry picked from commit cb5f41ea11b1a6fcd0977a64ee146dde8f537076)

Change-Id: I82c781d46fe16e7b7566a5b5ee91be723a2125cb

Merged-In: I8b0112074220b2e09baf13d842401ee1cf306a89

7 years agoA bit more refactoring in BackgroundDexOptService
Calin Juravle [Thu, 26 Jan 2017 01:08:03 +0000 (17:08 -0800)]
A bit more refactoring in BackgroundDexOptService

Extract convenient methods to help with:
- adding a shell command to run the background dexopt job
- extending idleOptimizations to cover secondary dex files

Test: device boots, background job run.
Bug: 32871170

(cherry picked from commit c660475aafe91269be306c802823cf543005ce36)

Change-Id: I146e4faeea90f2d58144a5dba26ae7f90a36b402

Merged-In: I18fde62a1cb05c030a620722d5f217589beaefb1

7 years ago[PM] Clean up logic for secondary dex oat files
Calin Juravle [Wed, 25 Jan 2017 09:05:50 +0000 (01:05 -0800)]
[PM] Clean up logic for secondary dex oat files

Add logic in DexManager to reconcile secondary dex records with the
actual files on disk. If secondary dex files are moved or removed then
DexManager will remove the generated oat files during the call to
reconcileSecondaryOdex() and update its internal state.

Add 'adb shell cmd package reconcile-secondary-dex packageName' which
will force DexManager to sync its data with the actual secondary dex
files.

Test: devices bots
      runtest -x .../PackageDexUsageTests.java
      runtest -x .../DexManagerTests.java
      adb shell cmd package reconcile-secondary-dex
com.android.google.gms (after artificially/temporarily renaming some
dex files)

Bug: 32871170

(cherry picked from commit c22c30ed1c05c5c24185dc4d380d1c5026923d46)

Change-Id: Ied9fcbfe367ed3a8250a9ba8d202518b264c64e8

Merged-In: Id2d72dc89995f89cf1ddf79ae4e992afd3f3c127

7 years agoCompile secondary dex files in DexManager
Calin Juravle [Tue, 17 Jan 2017 03:18:48 +0000 (19:18 -0800)]
Compile secondary dex files in DexManager

Add logic for secondary dex compilation in DexManager. Also, extend the
`cmd package compile` command with '--secondary-dex' option which will
compile all used secondary dex files for the given package.

Test: flash & boot,
      cmd package compile --secondary-dex -f -m speed
com.google.android.gms
Bug: 32871170

(cherry picked from commit c22c30ed1c05c5c24185dc4d380d1c5026923d46)

Change-Id: I3cf26edbfb5e9f3683e608bb2a596e1ab5682bd4

Merged-In: Ia2b95cb70d26c4ead5cb650047641b0881ca84ae

7 years agoNotify DexManager about new package installs
Calin Juravle [Tue, 24 Jan 2017 07:34:25 +0000 (23:34 -0800)]
Notify DexManager about new package installs

This will update the internal cache so that the secondary dex files of
the new package can be found when loaded.

Test: runtest -x .../DexManagerTests.java

Bug: 32871170

(cherry picked from commit 0d4b8f8b0c963d9a1f5cb6aff11a11195a3df225)

Change-Id: I34008f6d262f19e88a346a36b83e4093b4129105

Merged-In: I0cb7158af249feeb01cf578a7544dda978eede9d

7 years agoMerge "Fix Javadoc for StrictMode#permitUnbufferdIo"
Treehugger Robot [Thu, 2 Mar 2017 17:23:45 +0000 (17:23 +0000)]
Merge "Fix Javadoc for StrictMode#permitUnbufferdIo"

7 years agofd_utils: switch to libbase logging.
Narayan Kamath [Thu, 2 Mar 2017 17:04:08 +0000 (17:04 +0000)]
fd_utils: switch to libbase logging.

Test: make, boots
Change-Id: I4976508f489ca15af0484f75a9ef02ed575beff5

7 years agofd_utils: add missing logging for a couple of failure cases.
Narayan Kamath [Thu, 2 Mar 2017 14:44:45 +0000 (14:44 +0000)]
fd_utils: add missing logging for a couple of failure cases.

Also start using libbase style logging. Other log statements will
be converted in a follow up.

Test: make
Bug: 33579623
Change-Id: I34bb2ccab57e5bdd22aa35be8f8dcb68fdc4e097

7 years ago[CM] Allow timeout in request network
Etan Cohen [Wed, 1 Mar 2017 20:47:28 +0000 (12:47 -0800)]
[CM] Allow timeout in request network

Add (unhide) a public API which provides network requests with a
timeout. When timed-out the (newly unhidden) onUnavailable() callback
is triggered.

Note: this CL does not add a handler to the API to be consistent
with the existing APIs. There is a separate effort (b/32130437)
to update these APIs with Handlers.

Bug: 31399536
Test: unit tests and CTS (new)
Change-Id: I45ce9ada63372cb56937bb620bfbb7729e5e25d2

7 years agoMerge "ConnectivityManager: no double NetworkCallback registration"
Treehugger Robot [Thu, 2 Mar 2017 07:56:24 +0000 (07:56 +0000)]
Merge "ConnectivityManager: no double NetworkCallback registration"

7 years agoConnectivityManager: no double NetworkCallback registration
Hugo Benichi [Fri, 3 Feb 2017 06:55:42 +0000 (15:55 +0900)]
ConnectivityManager: no double NetworkCallback registration

Test: new test in ConnectivityManagerTest
Bug: 20701525
Change-Id: I205333d31d43e6e6c7fe704ce63b458065f345ce

7 years agoMerge "Added two new RIL commands support"
Treehugger Robot [Thu, 2 Mar 2017 06:02:19 +0000 (06:02 +0000)]
Merge "Added two new RIL commands support"

7 years agoAdded two new RIL commands support
Jack Yu [Thu, 16 Feb 2017 18:33:38 +0000 (10:33 -0800)]
Added two new RIL commands support

Added RIL_REQUEST_SEND_DEVICE_STATE and
RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER RIL requests support.

Test: telephony sanity tests
bug: 322238972012503728294587

Merged-In: I148a4322dfab2d8d84faf6505fb89dfc290411e3
Change-Id: I148a4322dfab2d8d84faf6505fb89dfc290411e3

7 years agoMerge "Basic javadoc for android.os.UpdateEngine."
Elliott Hughes [Thu, 2 Mar 2017 02:52:08 +0000 (02:52 +0000)]
Merge "Basic javadoc for android.os.UpdateEngine."

7 years agowifi: WifiConfiguration: update documentation for isHomeProviderNetwork
Peter Qiu [Wed, 1 Mar 2017 17:49:51 +0000 (09:49 -0800)]
wifi: WifiConfiguration: update documentation for isHomeProviderNetwork

Address API Councils comment on documentation for isHomeProviderNetwork
field.  Specifically, the expected value for this field for non-Passpoint
network configuration.

Bug: 35855359
Test: make -j32
Change-Id: Ie6cdcc39c5156dccc14ed144e58a6d2f201aef17

7 years agohotspot2: expose string constants for cert type and auth methods
Peter Qiu [Tue, 28 Feb 2017 23:12:16 +0000 (15:12 -0800)]
hotspot2: expose string constants for cert type and auth methods

So that we can use these constants in WifiService and the apps
as well in the future.

While there, remove auth method "CHAP" from the supported list,
since it is currenlty not supported by WifiService.

Bug: 34206769
Test: make -j32
Change-Id: Icadc3b13f2b135d51445d336116fbba86e96b70f

7 years agoMerge "Fix up EAP-SIM documentation"
Treehugger Robot [Thu, 2 Mar 2017 00:01:32 +0000 (00:01 +0000)]
Merge "Fix up EAP-SIM documentation"

7 years agoMerge "Remove FastJNI optimization on AssetManager to avoid dead lock."
Treehugger Robot [Wed, 1 Mar 2017 23:13:14 +0000 (23:13 +0000)]
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock."

7 years agoRemove FastJNI optimization on AssetManager to avoid dead lock.
Tim Zhang [Thu, 16 Feb 2017 01:55:27 +0000 (09:55 +0800)]
Remove FastJNI optimization on AssetManager to avoid dead lock.

I found there was a dead lock among main, android.display and GC threads
when running monkey test.
 - Main thread got a mutex and was suspended by GC thread.
 - Android.display thread waited for mutex held by main thread.
 - GC thread waited for suspention of android.display thread.

This will lead to ANR or screen freeze.

Merged-In: I13cf1eca3cb3b7c01aa754874f2b48aab0b472e8
Change-Id: I13cf1eca3cb3b7c01aa754874f2b48aab0b472e8

7 years agoFix up EAP-SIM documentation
Paul Stewart [Fri, 24 Feb 2017 18:21:35 +0000 (10:21 -0800)]
Fix up EAP-SIM documentation

Address API Council comments on doucmentation for the method calls
and constants related to EAP-SIM.  While here, improve unit tests
to ensure that passing a null certificate (chain) causes the config
to forget any existing client certificates.

Bug: 35847887
Test: Unit tests

Change-Id: I1c4e18e1a7cfb61aa4764e32778793368938e70b

7 years agoMerge "getTransport checks interface and instance names."
Treehugger Robot [Wed, 1 Mar 2017 21:24:24 +0000 (21:24 +0000)]
Merge "getTransport checks interface and instance names."

7 years agoMerge "Support for showing self-managed calls in IncallService."
Tyler Gunn [Wed, 1 Mar 2017 20:32:55 +0000 (20:32 +0000)]
Merge "Support for showing self-managed calls in IncallService."

7 years agoMerge changes from topic 'query-fplmn-sync'
nharold [Wed, 1 Mar 2017 20:25:15 +0000 (20:25 +0000)]
Merge changes from topic 'query-fplmn-sync'

* changes:
  Provide a public API for TelephonyManager.getForbiddenPlmns()
  Add support for querying Forbidden PLMNs

7 years agoMerge "Add DUN to networkAttributes"
Treehugger Robot [Wed, 1 Mar 2017 19:25:38 +0000 (19:25 +0000)]
Merge "Add DUN to networkAttributes"

7 years agoMerge "Permit privileged system apps to send SMS without persisting."
ashastry [Wed, 1 Mar 2017 18:18:46 +0000 (18:18 +0000)]
Merge "Permit privileged system apps to send SMS without persisting."

7 years agoMerge "[AWARE] Add data-path security configuration (PMK)"
Etan Cohen [Wed, 1 Mar 2017 17:39:14 +0000 (17:39 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)"

7 years agoFix Javadoc for StrictMode#permitUnbufferdIo
Shubham Ajmera [Wed, 1 Mar 2017 17:26:41 +0000 (09:26 -0800)]
Fix Javadoc for StrictMode#permitUnbufferdIo

Bug: 35813076
Test: no tests
Change-Id: I2f71cad7a7a3f85908b322e2b83ba265c49adbad

7 years agoTrack: ICU TimeZone: publish TIMEZONE_* constants
Tobias Thierer [Mon, 13 Feb 2017 19:19:43 +0000 (19:19 +0000)]
Track: ICU TimeZone: publish TIMEZONE_* constants

These are necessary to use the ICU TimeZone.getTimeZone(String, int) API
that was published in Android N.

Test: make update-api

Bug: 29318728
Change-Id: I078fb1cb93718b6e784f1de071b6f58f3abb7365

7 years agoMerge "Support confirmation of international calls while on WFC only."
Tyler Gunn [Wed, 1 Mar 2017 16:08:39 +0000 (16:08 +0000)]
Merge "Support confirmation of international calls while on WFC only."

7 years ago[AWARE] Add data-path security configuration (PMK)
Etan Cohen [Tue, 21 Feb 2017 18:08:42 +0000 (10:08 -0800)]
[AWARE] Add data-path security configuration (PMK)

Add API to optionally provide a pairwise master key (PMK)
to configure security on a data-path.

Clarify the default API to mean open (unencrypted) data-path.

Bug: 33552694
Test: unit tests and integration (sl4a) tests
Change-Id: I43fe704547f2921b3207f215e42d253837aa04e9

7 years agoMerge "Add API Surface for creating IpSec Transforms"
Treehugger Robot [Wed, 1 Mar 2017 14:05:47 +0000 (14:05 +0000)]
Merge "Add API Surface for creating IpSec Transforms"

7 years agoMove value for the Build.CUR_DEVELOPMENT constant into libcore
Tobias Thierer [Wed, 15 Feb 2017 20:38:29 +0000 (20:38 +0000)]
Move value for the Build.CUR_DEVELOPMENT constant into libcore

This matches a corresponding libcore change. It is to allow
libcore to use this value as a default when no other value is
explicitly set, e.g. in the system server or during testing
with vogar.

Bug: 34072201
Test: Device boots with CLs from this CL's topic.
Change-Id: Id812339a343ecea84a08bfdf4b873f3b156a13d4

7 years agoMerge "Fix dead lock in Tethering state machine"
Erik Kline [Wed, 1 Mar 2017 11:40:02 +0000 (11:40 +0000)]
Merge "Fix dead lock in Tethering state machine"

7 years agoMerge "Also test for additional NetworkCallback calls"
Treehugger Robot [Wed, 1 Mar 2017 10:55:34 +0000 (10:55 +0000)]
Merge "Also test for additional NetworkCallback calls"

7 years agoAlso test for additional NetworkCallback calls
Erik Kline [Tue, 28 Feb 2017 07:20:20 +0000 (16:20 +0900)]
Also test for additional NetworkCallback calls

Specifcally:
    - onCapabilitiesChanged
    - onLinkPropertiesChanged
    - onNetworkSuspended

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

Change-Id: Ie0f7c8ac21313b11980bb335c89ecde6fd8e311c

7 years agoAdd API Surface for creating IpSec Transforms
Nathan Harold [Fri, 13 Jan 2017 02:38:57 +0000 (18:38 -0800)]
Add API Surface for creating IpSec Transforms

This CL adds an API to set up an IPSec Security Association
and Security Policy to perform Transport-Mode and Tunnel-Mode encapuslation
of IP Packets.

Bug: 30984788
Bug: 34811752
Test: 3481205234811227
Change-Id: Ic9f63c7bb366302a24baa3e1b79020210910ac0a

7 years agogetTransport checks interface and instance names.
Yifan Hong [Wed, 1 Mar 2017 00:05:48 +0000 (16:05 -0800)]
getTransport checks interface and instance names.

Bug: 35219444
Test: hidl_test
Test: camera, soundtrigger works on marlin
Test: video playback works on marlin
Change-Id: I4d714d2576588cbd9a30d9687e992d34ee0db6d4

7 years agoMerge "Fix memory-leak warnings from the static analyzer"
Treehugger Robot [Wed, 1 Mar 2017 01:45:51 +0000 (01:45 +0000)]
Merge "Fix memory-leak warnings from the static analyzer"

7 years agoMerge "Add @hide to RttAudioMode IntDef"
Hall Liu [Wed, 1 Mar 2017 00:51:37 +0000 (00:51 +0000)]
Merge "Add @hide to RttAudioMode IntDef"

7 years agoFix memory-leak warnings from the static analyzer
George Burgess IV [Wed, 25 Jan 2017 00:30:22 +0000 (16:30 -0800)]
Fix memory-leak warnings from the static analyzer

Warnings:
frameworks/base/core/jni/android_view_InputChannel.cpp:145:5: warning:
Potential memory leak
jobject serverChannelObj =
android_view_InputChannel_createInputChannel(env,
^~~~~~~~~~~~~~~~~~~~~~~~
frameworks/base/core/jni/android_view_InputChannel.cpp:151:5: warning:
Potential memory leak
jobject clientChannelObj =
android_view_InputChannel_createInputChannel(env,
^~~~~~~~~~~~~~~~~~~~~~~~

The warnings were complaining about that we might leak
nativeInputChannel, in android_view_InputChannel_createInputChannel,
since we're allocating it as an arg and not always putting it somewhere.

Bug: None
Test: Builds without warnings
Change-Id: I62163adee5d420ad78c8d4c74aafefc8a58f765b

7 years agoBasic javadoc for android.os.UpdateEngine.
Elliott Hughes [Mon, 27 Feb 2017 17:37:02 +0000 (09:37 -0800)]
Basic javadoc for android.os.UpdateEngine.

Bug: N/A
Test: N/A
Change-Id: Icb870e7720e8b50082d353e7ea08007e1f4e2fdc

7 years agoAdd @hide to RttAudioMode IntDef
Hall Liu [Tue, 28 Feb 2017 23:17:44 +0000 (15:17 -0800)]
Add @hide to RttAudioMode IntDef

IntDefs apparently require an @hide annotation to avoid breaking CTS
tests. Adding it here.

Change-Id: Ifd748b55e68091132571df7e74fdb797bd6a83fc
Test: CTS
Fix: 35808951

7 years agoMerge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
Brad Ebinger [Tue, 28 Feb 2017 22:44:54 +0000 (22:44 +0000)]
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"

7 years agoCheck for spurious wake ups
Tom Cherry [Tue, 28 Feb 2017 22:07:09 +0000 (14:07 -0800)]
Check for spurious wake ups

Condition::wait() can spuriously wake up, so we must guard it with
another check to ensure that a given wake was truly due to having
been signaled.

Bug: 34592766
Test: Boot bullhead
Change-Id: Iaa5a0ca6186aea50c51e2c402ef95d7ba861be92

7 years agoSupport confirmation of international calls while on WFC only.
Tyler Gunn [Fri, 17 Feb 2017 00:21:14 +0000 (16:21 -0800)]
Support confirmation of international calls while on WFC only.

Add new carrier config which enables a confirmation message when the user
dials an international number while on WFC only.

Add new @hide PhoneNumberUtils method which is used to determine if a
number dialed is an international number.

Test: Manual, unit.
Bug: 33272455
Merged-In: Ia7ffe10eee7d782ddc3355db616af0a48f19556e
Change-Id: Ia7ffe10eee7d782ddc3355db616af0a48f19556e

7 years agoMerge "Bluetooth: fix enable log: display 24h time"
Andre Eisenbach [Tue, 28 Feb 2017 19:04:13 +0000 (19:04 +0000)]
Merge "Bluetooth: fix enable log: display 24h time"

7 years agoBluetooth: fix enable log: display 24h time
Marie Janssen [Fri, 24 Feb 2017 19:06:33 +0000 (11:06 -0800)]
Bluetooth: fix enable log: display 24h time

Test: adb bugreport at 1pm, observe 13:xx:yy instead of 01:xx:yy
Change-Id: I172dcc63f0f43563ec692349a9434f63c55eac25

7 years agoSend the IMS_SERVICE_UP intent when it is STATE_READY
Brad Ebinger [Mon, 27 Feb 2017 21:38:53 +0000 (13:38 -0800)]
Send the IMS_SERVICE_UP intent when it is STATE_READY

The ImsService must send the IMS_SERVICE_UP intent when it
signals that it is in the STATE_READY state and
IMS_SERVICE_DOWN when it is STATE_INITIALIZING or
STATE_NOT_AVAILABLE.

Also, add READ_PRIVILEGED_PHONE_STATE check

Bug: 35736451
Test: Unit tests added in frameworks/opt/telephony
Change-Id: I03d4398cf7008cf8c51b78d99eb029aa99c63f62

7 years agoMerge "Setting for RecommendedNetworkEvaluator cache TTL"
Treehugger Robot [Tue, 28 Feb 2017 17:05:43 +0000 (17:05 +0000)]
Merge "Setting for RecommendedNetworkEvaluator cache TTL"

7 years agoMerge "Move seccomp policy logic to bionic"
Treehugger Robot [Tue, 28 Feb 2017 15:36:07 +0000 (15:36 +0000)]
Merge "Move seccomp policy logic to bionic"

7 years agoSetting for RecommendedNetworkEvaluator cache TTL
Amin Shaikh [Tue, 7 Feb 2017 00:22:42 +0000 (16:22 -0800)]
Setting for RecommendedNetworkEvaluator cache TTL

Bug: 19948759
Bug: 33694078
Test: runtest frameworks-core
Change-Id: Ic1820dc3d70170e6b7c740696abf87d284c6e2ea
Merged-In: Ic1820dc3d70170e6b7c740696abf87d284c6e2ea

7 years agoProvide a public API for TelephonyManager.getForbiddenPlmns()
Nathan Harold [Tue, 24 Jan 2017 00:32:34 +0000 (16:32 -0800)]
Provide a public API for TelephonyManager.getForbiddenPlmns()

Bug: 33296073
Test: none
Change-Id: I4f1bce663669c18098755c386456e6e9687a3cfb

7 years agoAdd support for querying Forbidden PLMNs
Nathan Harold [Mon, 14 Nov 2016 23:31:27 +0000 (15:31 -0800)]
Add support for querying Forbidden PLMNs

Bug: 32277497
Test: Verified via public API for: missing SIM and working SIM
Change-Id: Ib7838a4be81853ef336e4f3d527c483b49cd2167

7 years agoMerge "Adds read/modify permission checks to ImsService"
Brad Ebinger [Mon, 27 Feb 2017 21:19:16 +0000 (21:19 +0000)]
Merge "Adds read/modify permission checks to ImsService"

7 years agoMerge "[AWARE] Remove (hide) sendMessage with retryCount API"
Etan Cohen [Mon, 27 Feb 2017 18:33:34 +0000 (18:33 +0000)]
Merge "[AWARE] Remove (hide) sendMessage with retryCount API"

7 years agoMove seccomp policy logic to bionic
Paul Lawrence [Thu, 16 Feb 2017 17:25:12 +0000 (09:25 -0800)]
Move seccomp policy logic to bionic

Test: Make sure builds, runs, seccomp policy still applied
Bug: 35720753
Change-Id: Ieb09dd88cf070d4b4f1277d1a88d0ce250bb05b4

7 years agoMerge "Revert "Move seccomp policy logic to bionic""
Paul Lawrence [Mon, 27 Feb 2017 16:39:11 +0000 (16:39 +0000)]
Merge "Revert "Move seccomp policy logic to bionic""