OSDN Git Service

android-x86/frameworks-base.git
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 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: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 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."
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."
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"
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."
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:19:25 +0000 (18:19 +0000)]
Merge "RecoverySystem: Fix the issue in installPackage()."

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: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"
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"
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: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:18:18 +0000 (10:18 +0000)]
Merge "Add java.time APIs."

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: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: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 15:58:36 +0000 (15:58 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""

7 years agoRevert "Don't offer the BT sharing option to the user if BT is disallowed."
Andre Eisenbach [Thu, 12 Jan 2017 15:56:39 +0000 (15:56 +0000)]
Revert "Don't offer the BT sharing option to the user if BT is disallowed."

Causes boot loop issue:

02-15 02:31:59.785   770   770 E System  : Caused by: java.lang.IllegalArgumentException: Unknown component: com.android.bluetooth/com.android.bluetooth.opp.BluetoothOppLauncherActivity
02-15 02:31:59.785   770   770 E System  : .at com.android.server.pm.PackageManagerService.setEnabledSetting(PackageManagerService.java:18500)
02-15 02:31:59.785   770   770 E System  : .at com.android.server.pm.PackageManagerService.setComponentEnabledSetting(PackageManagerService.java:18461)
02-15 02:31:59.785   770   770 E System  : .at android.app.ApplicationPackageManager.setComponentEnabledSetting(ApplicationPackageManager.java:2129)
02-15 02:31:59.785   770   770 E System  : .at com.android.server.BluetoothManagerService.updateOppLauncherComponentState(BluetoothManagerService.java:2036)

This reverts commit 77fe44ffb6b5d40daf3b127cb36d5111b7618cc1.

Change-Id: Ia079bb2fcc91bb5979a3840ab50b9d9ddda1cf24

7 years agoMerge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part...
Mark Salyzyn [Thu, 12 Jan 2017 15:18:25 +0000 (15:18 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"

7 years agoMerge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"
Treehugger Robot [Thu, 12 Jan 2017 11:20:05 +0000 (11:20 +0000)]
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"

7 years agoMerge "Simplify UpstreamNetworkMonitor callback handling"
Treehugger Robot [Thu, 12 Jan 2017 10:18:24 +0000 (10:18 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling"

7 years agoMerge "Use new read(Embedded)Buffer APIs."
Treehugger Robot [Thu, 12 Jan 2017 10:17:38 +0000 (10:17 +0000)]
Merge "Use new read(Embedded)Buffer APIs."

7 years agoTrack libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 09:40:47 +0000 (09:40 +0000)]
Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d

java.util.regex named group capture support.

Test: vogar OldMatcherTest
Bug: 19717812
Change-Id: I525489bc26083b22bb2ce670d614f6d6e6eeaa29

7 years agoMerge "Expose WifiManager#connect and ActionListener as @SystemApi"
Treehugger Robot [Thu, 12 Jan 2017 07:15:05 +0000 (07:15 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"

7 years agoExpose WifiManager#connect and ActionListener as @SystemApi
Stephen Chen [Fri, 6 Jan 2017 23:34:28 +0000 (15:34 -0800)]
Expose WifiManager#connect and ActionListener as @SystemApi

This is needed by Wifi Wakeup and Notifications which live within
NetworkRecommendation package.

Bug: 33224871
Test: GTS
Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
Merged-In: If4f1f9957f82b1292af4187c7728cbccab0184e8

7 years agoMerge "Remove libservicestestsjni"
Treehugger Robot [Thu, 12 Jan 2017 04:50:56 +0000 (04:50 +0000)]
Merge "Remove libservicestestsjni"

7 years agoSimplify UpstreamNetworkMonitor callback handling
Erik Kline [Wed, 11 Jan 2017 08:34:50 +0000 (17:34 +0900)]
Simplify UpstreamNetworkMonitor callback handling

In the callback post a lamba to the target state machine's handler
that does the processing we need before sending a notification to
the state machine.

No semantic change, just a bit cleaner.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - tested basic wifi-to-mobile tethering (no DUN)
Bug: 32163131
Change-Id: I07e1b510c1ebaa5dffd42a3f16ba96e961cb58f1

7 years agoRemove libservicestestsjni
Colin Cross [Wed, 11 Jan 2017 22:29:10 +0000 (14:29 -0800)]
Remove libservicestestsjni

frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.

Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065
(cherry-picked from e399468b88ae84a586f9d583251ee0a6a7e94a43)
Merged-In: I8f307373aede9e749f1b992dde0f7252bf74b065

7 years agoMerge "BpBase -> BpHwBase"
Treehugger Robot [Thu, 12 Jan 2017 01:50:57 +0000 (01:50 +0000)]
Merge "BpBase -> BpHwBase"

7 years agoReplace cutils/log.h and log/logger.h with android/log.h or log/log.h
Mark Salyzyn [Wed, 28 Sep 2016 23:15:30 +0000 (16:15 -0700)]
Replace cutils/log.h and log/logger.h with android/log.h or log/log.h
(part deux)

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I7417936c4d3666608fccfe51a312c90ecefba2fb

7 years agoMerge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
Etan Cohen [Wed, 11 Jan 2017 22:59:24 +0000 (22:59 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"

7 years agoMerge "Move getActiveScorerPackage() to the score service."
Treehugger Robot [Wed, 11 Jan 2017 19:40:44 +0000 (19:40 +0000)]
Merge "Move getActiveScorerPackage() to the score service."

7 years ago[AWARE] Unhide Wi-Fi Aware API (baseline)
Etan Cohen [Tue, 10 Jan 2017 05:47:32 +0000 (21:47 -0800)]
[AWARE] Unhide Wi-Fi Aware API (baseline)

Baseline Wi-Fi Aware API providing discovery and connectivity (data-path).

Bug: 30983968
Test: unit tests + integration (sl4a) tests passing.
Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933

7 years agoAdd java.time APIs.
Joachim Sauer [Thu, 13 Oct 2016 14:46:37 +0000 (15:46 +0100)]
Add java.time APIs.

This adds all of java.time and added fields/methods to
java.util.Calendar and related classes that have circular
dependencies to java.time.

Bug: 28832222
Test: builds
Change-Id: Id8407b3fcb57e11958ee7852d19d897291fb340d

7 years agoMerge "Fix clipping for edit screen of Quick Settings"
Treehugger Robot [Wed, 11 Jan 2017 15:51:36 +0000 (15:51 +0000)]
Merge "Fix clipping for edit screen of Quick Settings"

7 years agoMerge "Replace cutils/log.h and log/logger.h with log/log.h"
Mark Salyzyn [Wed, 11 Jan 2017 15:24:10 +0000 (15:24 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h"

7 years agoMerge "Switch ConfigUpdater to the new version of timezone updater code"
Neil Fuller [Wed, 11 Jan 2017 14:46:46 +0000 (14:46 +0000)]
Merge "Switch ConfigUpdater to the new version of timezone updater code"

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed."
Treehugger Robot [Wed, 11 Jan 2017 14:40:05 +0000 (14:40 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."

7 years agoMerge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
Neil Fuller [Wed, 11 Jan 2017 13:27:09 +0000 (13:27 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"

7 years agoUse new read(Embedded)Buffer APIs.
Martijn Coenen [Wed, 11 Jan 2017 11:35:56 +0000 (12:35 +0100)]
Use new read(Embedded)Buffer APIs.

Bug: 34134129
Test: mma, hidl_test_java
Change-Id: I13b3841778d5df4e7c37760610712a26c68896d6

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
Treehugger Robot [Wed, 11 Jan 2017 10:28:16 +0000 (10:28 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."

7 years agoCleanup code given PATCHOAT_FOR_RELOCATION has been removed.
Richard Uhler [Thu, 8 Dec 2016 10:33:09 +0000 (10:33 +0000)]
Cleanup code given PATCHOAT_FOR_RELOCATION has been removed.

Test: make, device boots, installed an app
Test: adb shell cmd package compile -m speed|speed-profile <app>
Bug: 33192586
Change-Id: I8ef7d4926773586251fedf8a7737a8005f119859

7 years agoMerge "Prepare UpstreamNetworkMonitor for extraction"
Erik Kline [Wed, 11 Jan 2017 08:29:17 +0000 (08:29 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction"

7 years agoPrepare UpstreamNetworkMonitor for extraction
Erik Kline [Tue, 10 Jan 2017 08:37:54 +0000 (17:37 +0900)]
Prepare UpstreamNetworkMonitor for extraction

Test: as follows:
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net
    - tested basic wifi-to-mobile tethering (no DUN)
Bug: 32163131
Change-Id: Id0b2497f231af5e79ae3bbf42c73bc78031b6fa3

7 years agoFix clipping for edit screen of Quick Settings
Akira Oshimi [Fri, 16 Dec 2016 09:57:28 +0000 (18:57 +0900)]
Fix clipping for edit screen of Quick Settings

The width of the edit screen is fixed when the display size is updated
in landscape mode. So when the device is rotated to portrait mode, the
width is not updated and the edit screen is truncated.
To fix this issue, "match_parent" should be used to match to the width
of Notification Panel always.

Bug: 34206618
Test: manual - go to Settings, rotate device to landscape mode, change
               display size (Default > Large > Default), rotate device
               to portrait mode and show QS edit screen

Change-Id: I35ac623812908a61cd34357e6bda567cab55ace1

7 years agoMerge "Zygote: Add fdsToIgnore"
Treehugger Robot [Wed, 11 Jan 2017 02:20:36 +0000 (02:20 +0000)]
Merge "Zygote: Add fdsToIgnore"

7 years agoMerge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ...
Treehugger Robot [Wed, 11 Jan 2017 02:15:28 +0000 (02:15 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ...

* changes:
  Add an extra debug flag to BackgroundDexOptimizer
  Some refactoring in BackgroundDexOptService.
  Do not try to resolve realpath in DexManager.
  Log DexManager realpath errors only in debug mode.
  Record data about dex files use on disk
  Add logic for recording dex files use on disk

7 years agoMerge "Delete old WifiNotificationController strings."
Treehugger Robot [Wed, 11 Jan 2017 02:12:48 +0000 (02:12 +0000)]
Merge "Delete old WifiNotificationController strings."

7 years agoMerge "Moved isCallerActiveScorer() to the score service."
Treehugger Robot [Wed, 11 Jan 2017 01:30:02 +0000 (01:30 +0000)]
Merge "Moved isCallerActiveScorer() to the score service."

7 years agoMerge changes I559eb049,I52425b84
Treehugger Robot [Wed, 11 Jan 2017 01:06:56 +0000 (01:06 +0000)]
Merge changes I559eb049,I52425b84

* changes:
  DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
  DO NOT MERGE Logging improvements in CaptivePortalLoginActivity

7 years agoMerge changes I1eaab5ea,I42928da8
Treehugger Robot [Wed, 11 Jan 2017 01:02:05 +0000 (01:02 +0000)]
Merge changes I1eaab5ea,I42928da8

* changes:
  DO NOT MERGE Captive portal systel log improvements
  DO NOT MERGE Fix flaky IpPrefixTest.

7 years agoMerge "Fix a use-of-uninitialized-value warning."
John Reck [Wed, 11 Jan 2017 00:57:34 +0000 (00:57 +0000)]
Merge "Fix a use-of-uninitialized-value warning."

7 years agoZygote: Add fdsToIgnore
Andreas Gampe [Thu, 5 Jan 2017 20:45:58 +0000 (12:45 -0800)]
Zygote: Add fdsToIgnore

Add file descriptors that should be ignored in the file descriptor
table check.

Use this to ignore the pipe file descriptors when starting an app
with invoke-with (wrapper).

Bug: 32607405
Test: m
Test: Device boots
Test: Apps start
Test: adb root && adb shell setprop wrap.com.android.calculator2 logwrapper && adb shell am start -S -n com.android.calculator2/.Calculator
Change-Id: I4a30dfc9382d3172cc815bd41b17a123799354f6

7 years agoAdd an extra debug flag to BackgroundDexOptimizer
Calin Juravle [Thu, 22 Dec 2016 16:50:05 +0000 (18:50 +0200)]
Add an extra debug flag to BackgroundDexOptimizer

This makes testing/debugging the job a bit easier.

Test: device boots, packages get compiled
Bug: 32871170

(cherry picked from commit a50d58e22630cd651a815381639e70476991bdbf)

Change-Id: I5b94a8f0b3bbf9075dcaecf028aaf79a21aaab7b

7 years agoSome refactoring in BackgroundDexOptService.
Calin Juravle [Thu, 22 Dec 2016 16:50:05 +0000 (18:50 +0200)]
Some refactoring in BackgroundDexOptService.

Extract postOta/idle optimizations in their own method.
In preparation for adding the logic to handle secondary dex files.

Test: device boots, pacakges get compiled
Bug: 32871170

(cherry picked from commit be6a71a0b3f369843a26c91dd5123d0499f00e7e)

Change-Id: Ie6cdd8461e7214f5de68bc9172f4171ebf72aa39

7 years agoDo not try to resolve realpath in DexManager.
Calin Juravle [Thu, 22 Dec 2016 16:47:05 +0000 (18:47 +0200)]
Do not try to resolve realpath in DexManager.

PM should already provide the real path of the application directory.

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

Bug: 33807524
Bug: 32871170

(cherry picked from commit c066205cea051c6d9f386188b9cb426c03dbee2d)

Change-Id: Ie6b5f5e61d08710e7ef7d3149b7b13cc7d03a242

7 years agoLog DexManager realpath errors only in debug mode.
Calin Juravle [Thu, 22 Dec 2016 14:31:19 +0000 (14:31 +0000)]
Log DexManager realpath errors only in debug mode.

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

(cherry picked from commit bb9ed1f3c93f0267fa97d6cbeb58ecd1de41d795)

Change-Id: Ib962edf67ce7f5b9b93c9bc6855675e00e025810

7 years agoRecord data about dex files use on disk
Calin Juravle [Fri, 16 Dec 2016 16:22:00 +0000 (16:22 +0000)]
Record data about dex files use on disk

Add DexManager to keep track of how dex files are used.

Every time a dex file is loaded, PackageManager will notify DexManager
which will process the load. The DexManager will look up what package
owns the dex file and record its use in package-dex-usage.list (through
PackageDexUsage).

Test: device boots, package-dex-usage.list is created and contains valid data, after device reboot the list is succesfully read from disk.
runtest -x .../PackageDexUsageTests.java
runtest -x .../DexManagerTests.java

Bug: 32871170

(cherry picked from commit b8976d8f22fecaa9ed39276d9d8ded17d35b51a6)

Change-Id: I9d779b2d39814d7c54fc7a888df93d403a001df5

7 years agoAdd logic for recording dex files use on disk
Calin Juravle [Thu, 1 Dec 2016 17:53:07 +0000 (17:53 +0000)]
Add logic for recording dex files use on disk

Add PackageDexUsage to handle the I/O operations of dex usage data. It
is responsible to encode, save and load dex

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

Bug: 32871170

(cherry picked from commit 0318162abcbd07a0472989df43e00e353fac731b)

Change-Id: I6d483d480d62aa14cb1663560fd88092469a2835

7 years agoMove getActiveScorerPackage() to the score service.
Jeremy Joslin [Tue, 10 Jan 2017 21:08:32 +0000 (13:08 -0800)]
Move getActiveScorerPackage() to the score service.

Implemented getActiveScorerPackage() in the NetworkScoreService to
make it more efficient (no need to query PM).

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 33781558
Change-Id: Iee7610e4982b44aefa1ef8b6c208292b8f9adcf8
Merged-In: I2144351c2c09cad30f80399069364f3572e38445

7 years agoMoved isCallerActiveScorer() to the score service.
Jeremy Joslin [Tue, 10 Jan 2017 00:22:20 +0000 (16:22 -0800)]
Moved isCallerActiveScorer() to the score service.

Implemented isCallerActiveScorer() in the NetworkScoreService to make
it more efficient (no need to query PM). Exposed the call as a new
internal API on NetworkScoreManager and deprecated the call on
NetworkScorerAppManager.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 33781558
Change-Id: I8ad232f8ef34b6e2f155ebb232e64300303300f0
Merged-In: I0e2142af95b068d322343f7c9362ac53d46b545e

7 years agoFix a use-of-uninitialized-value warning.
George Burgess IV [Tue, 10 Jan 2017 23:33:57 +0000 (15:33 -0800)]
Fix a use-of-uninitialized-value warning.

This warning was generated by the static analyzer:
warning: The left expression of the compound assignment is an
uninitialized value. The computed value will also be garbage
        *mDirtyMask |= animator->dirtyMask();

This can be fixed by initializing dirtyMask before using it in
AnimateFunctor.

Bug: None
Test: Static analyzer no longer complains about this.
Change-Id: I892749079cf93a012f1bed059a3f0c8bbaed9d7e

7 years agoMerge "Fix naming of key"
Jordan Liu [Tue, 10 Jan 2017 22:51:49 +0000 (22:51 +0000)]
Merge "Fix naming of key"

7 years agoMerge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc
Treehugger Robot [Tue, 10 Jan 2017 22:21:01 +0000 (22:21 +0000)]
Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc

* changes:
  Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.
  Split core/jni/fd_utils-inl.h into a .h/.cpp pair.
  Zygote: Additional whitelisting for legacy devices.
  Zygote: Additional whitelists for runtime overlay / other static resources.

7 years agoMerge "Cleanup test method names."
Treehugger Robot [Tue, 10 Jan 2017 22:18:56 +0000 (22:18 +0000)]
Merge "Cleanup test method names."

7 years agoMerge "Remove unused variable."
Treehugger Robot [Tue, 10 Jan 2017 21:15:01 +0000 (21:15 +0000)]
Merge "Remove unused variable."

7 years agoCleanup test method names.
Jeremy Joslin [Tue, 10 Jan 2017 16:53:02 +0000 (08:53 -0800)]
Cleanup test method names.

Renamed some test methods to reflect the proper permission.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 1764042
Change-Id: Ia7db8826ad18c3b8f119aa063cb2c7b3793a9d17
Merged-In: I5551ddcb411432c6aeb14c03d9a284aa68f1bd1b

7 years agoDynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.
Robert Sesek [Fri, 2 Dec 2016 22:27:50 +0000 (17:27 -0500)]
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.

This refactors the whitelist to be a class, rather than just a static C array.
The whitelist can then be augmented dynamically when the package path is known
in the webview_zygote.

Test: m
Test: sailfish boots
Test: Enable Multi-process WebView in developer options, perform a search in GSA.

Bug: 21643067
Change-Id: Ia1f2535c7275b42b309631b4fe7859c30cbf7309
(cherry picked from commit 061ee3088a79ab0e07d37d1c0897d51422f29c4e)

7 years agoSplit core/jni/fd_utils-inl.h into a .h/.cpp pair.
Robert Sesek [Fri, 16 Dec 2016 19:02:31 +0000 (14:02 -0500)]
Split core/jni/fd_utils-inl.h into a .h/.cpp pair.

(cherry picked from commit 44afe8be8f654192dc436a9c4238a925c22b14bf)

Test: m
Test: sailfish boots

Change-Id: I9ca93f31f6c20b702b2207333a9d56f6592630b0

7 years agoZygote: Additional whitelisting for legacy devices.
Narayan Kamath [Mon, 7 Nov 2016 19:59:29 +0000 (19:59 +0000)]
Zygote: Additional whitelisting for legacy devices.

On M and below, we provide a blanket whitelist for all files under
"/vendor/zygote_whitelist". This path is whitelisted purely to allow
this patch to be applied easily on legacy devices and configurations.

Note that this does not amount to a loosening of our security policy
because whitelisted files are reopened anyway.

(cherry picked from commit 5e2f7c6229d7191183888d685b57a7d0a2835fce)

Bug: 32691930
Test: manual
Change-Id: If5b53f6f0a707f8d36603c09bfd3f72dbfbbbb99

7 years agoRemove unused variable.
Tao Wu [Fri, 11 Nov 2016 18:42:02 +0000 (10:42 -0800)]
Remove unused variable.

Code search show nobody referenced it and aosp image still compiles after
remove it.

Test: make -j18 systemimage userdataimage ramdisk

Change-Id: I3e37ea590610091b938296c999dceb3caf919906
Merged-In: I3e37ea590610091b938296c999dceb3caf919906
Signed-off-by: Tao Wu <lepton@google.com>
7 years agoZygote: Additional whitelists for runtime overlay / other static resources.
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.

Partially cherry picked from commit 1c15c635785c64a.

These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.

(cherry picked from commit 25cd01cc69fcad34756b00e52a79c0c54178f2e6)

Bug: 32618130
Test: m
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f

7 years agoDelete old WifiNotificationController strings.
Stephen Chen [Tue, 13 Dec 2016 22:44:18 +0000 (14:44 -0800)]
Delete old WifiNotificationController strings.

Bug: 33355924
Test: make

Change-Id: Ia7065549168b4f342760e2f77efe4d9eb1851eb9

7 years agoDon't offer the BT sharing option to the user if BT is disallowed.
Lenka Trochtova [Mon, 9 Jan 2017 18:48:51 +0000 (19:48 +0100)]
Don't offer the BT sharing option to the user if BT is disallowed.

Disable BluetoothOppLauncherActivity component if the
UserManager#BLUETOOTH_DISALLOWED user restriction is set.

Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895060

Change-Id: I4316843b2858aefa750f12a8a0e940424aa21a10

7 years agoMerge "Methods to calculate user and external disk usage."
Jeff Sharkey [Tue, 10 Jan 2017 04:30:46 +0000 (04:30 +0000)]
Merge "Methods to calculate user and external disk usage."

7 years agoBpBase -> BpHwBase
Yifan Hong [Tue, 10 Jan 2017 01:58:33 +0000 (17:58 -0800)]
BpBase -> BpHwBase

Test: compiles

Bug: 33554989
Change-Id: I6ed40f4d0ac08876ab804720b193a17b49a93890

7 years agoMerge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age"
Treehugger Robot [Tue, 10 Jan 2017 00:26:42 +0000 (00:26 +0000)]
Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age"

7 years agoMethods to calculate user and external disk usage.
Jeff Sharkey [Mon, 9 Jan 2017 00:06:58 +0000 (17:06 -0700)]
Methods to calculate user and external disk usage.

Add method to calculate user disk usage, which will be faster than
making a Binder call for every single appId under a user.  Add method
to calculate external disk usage, which uses file extensions to track
usage with "audio", "video", and "images" categories.

Start measuring internal and external storage space separately; new
GIDs are coming in a future CL.  Pass down all package names, inodes,
and code paths, since shared UIDs host more than one.

Test: builds, boots, stats are consistent
Bug: 2794881732206268
Change-Id: Icbb82a30fe711ef05e9a16bb1dc740dc943a9ddc

7 years agoMerge "Cherrypick: Create ScoredNetwork Badging API changes."
Treehugger Robot [Mon, 9 Jan 2017 23:39:47 +0000 (23:39 +0000)]
Merge "Cherrypick: Create ScoredNetwork Badging API changes."

7 years agoMerge "Expose fields in WifiConfiguration."
Treehugger Robot [Mon, 9 Jan 2017 23:33:24 +0000 (23:33 +0000)]
Merge "Expose fields in WifiConfiguration."