OSDN Git Service
Lenka Trochtova [Thu, 24 Nov 2016 15:48:37 +0000 (16:48 +0100)]
Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on
the entire device - i.e. in all the users.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug:
32895300
Change-Id: Iae77647b1e48be6b8efbeccdff6a3d468a0e174d
Treehugger Robot [Thu, 1 Dec 2016 03:08:44 +0000 (03:08 +0000)]
Merge "Add meteredOverride field to WifiConfiguration."
Treehugger Robot [Thu, 1 Dec 2016 02:38:29 +0000 (02:38 +0000)]
Merge "App_process: Merge app_process and app_process__asan"
Treehugger Robot [Thu, 1 Dec 2016 01:59:13 +0000 (01:59 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
Andreas Gampe [Thu, 1 Dec 2016 00:35:32 +0000 (16:35 -0800)]
App_process: Merge app_process and app_process__asan
Two birds with one stone: simplify the setup (including the modules
required in PRODUCT_PACKAGES) and work around a build system issue
wrt/ sanitized static libraries.
Bug:
33224213
Test: mmma frameworks/base/cmds/app_process && \
mmma SANITIZE_TARGET=address SANITIZE_LITE=true \
frameworks/base/cmds/app_process && \
ls $OUT/system/bin/asanwrapper && \
readelf -s $OUT/system/bin/app_process32 | grep asan && \
readelf -s $OUT/system/bin/asan/app_process32 | grep asan && \
Change-Id: Ieff0ea9a2209cf74cf06f813087b55cb0bcc3896
Amin Shaikh [Tue, 22 Nov 2016 01:27:53 +0000 (17:27 -0800)]
Refactor NetworkScoreAppManager for testing.
Test: runtest frameworks-services && runtest frameworks-core
Change-Id: Ie2172009e9ba0438050488fe0aea6408f852c2c2
Treehugger Robot [Wed, 30 Nov 2016 21:00:55 +0000 (21:00 +0000)]
Merge "App_process: Clean up sanitized binaries"
Treehugger Robot [Wed, 30 Nov 2016 20:35:37 +0000 (20:35 +0000)]
Merge "LOCAL_CLANG := true is now the default"
Treehugger Robot [Wed, 30 Nov 2016 20:25:12 +0000 (20:25 +0000)]
Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings."
Robert Greenwalt [Wed, 30 Nov 2016 19:47:22 +0000 (19:47 +0000)]
Merge "Fix MSIM issue of broadcast intent overwritten unintentionally"
Stephen Chen [Mon, 28 Nov 2016 19:40:58 +0000 (11:40 -0800)]
Add meteredOverride field to WifiConfiguration.
This stores a user's metered selection. This will be set by
Settings -> Data Usage -> Network restrictions and used in conjunction
with WifiConfiguration.meteredHint to properly track a Wifi network's
metered state.
Bug:
33106464
Bug:
26545374
Test: runtest --path
frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java
runtest --path
frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
Change-Id: I1a378ef2946c1b5b6091bba379f2ab48a15d29d8
nharold [Wed, 30 Nov 2016 18:00:34 +0000 (18:00 +0000)]
Merge "Expose GSM Timing Advance, Update LTE TA docstring"
Andreas Gampe [Wed, 30 Nov 2016 03:28:13 +0000 (19:28 -0800)]
App_process: Clean up sanitized binaries
Clean up the definition of sanitized binaries. Clean up the
Android.mk to share values.
Bug:
33224213
Test: mmma SANITIZE_TARGET=address SANITIZE_LITE=true frameworks/base/cmds/app_process && ls $OUT/system/bin/asan
Change-Id: I70f8d95ff2ec6366fc0a7d252b91dce268186910
Jordan Liu [Wed, 30 Nov 2016 17:42:30 +0000 (17:42 +0000)]
Merge "Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY"
Glenn Kasten [Mon, 15 Aug 2016 23:10:24 +0000 (16:10 -0700)]
LOCAL_CLANG := true is now the default
Change-Id: I2f6a8c7f32cbf682c968a43d590d773ffb21e909
(cherry picked from commit
3a7510bcf6089d3ef768de7cf805ca783f0aac17)
Etan Cohen [Wed, 30 Nov 2016 16:58:07 +0000 (16:58 +0000)]
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions"
Etan Cohen [Wed, 16 Nov 2016 15:07:11 +0000 (07:07 -0800)]
[AWARE] Data-path creation roles hard-coded for discovery sessions
Data-path roles (initiator & responder) are hard-coded for discovery
session participants by the spec: subscriber <-> initiator and
publisher <-> responder. Remove API parameter which allowed caller
to specify role.
(cherry-pick of commit
9c7483fec41db681a2d6de93a9061fb8764ecba5)
Bug:
32883026
Test: unit-tests and integration (sl4a) tests passing.
Change-Id: I889eacda9416d9ecd04caa0c72413f984611d40c
Paul Duffin [Wed, 30 Nov 2016 12:04:23 +0000 (12:04 +0000)]
Merge "Add legacy-test as replacement for core-junit"
Treehugger Robot [Wed, 30 Nov 2016 07:59:54 +0000 (07:59 +0000)]
Merge "Fix batterySendBroadcast not synchronized issue."
Treehugger Robot [Wed, 30 Nov 2016 00:39:18 +0000 (00:39 +0000)]
Merge "Preload2: Add sequence UI"
Andreas Gampe [Mon, 28 Nov 2016 23:07:39 +0000 (15:07 -0800)]
Preload2: Add sequence UI
Add a fake UI that can run a sequence of actions (and replies).
Bug:
31961946
Test: manual
Change-Id: Iee0fac5ddf75a97eff7b401c9c932634489349de
Paul Duffin [Mon, 28 Nov 2016 15:51:09 +0000 (15:51 +0000)]
Add legacy-test as replacement for core-junit
Statically includes core-junit-static into legacy-test target so
that legacy-test can be used in place of core-test. Once that
switch over has been done then android.test classes that are
being removed from the public API can be safely moved into here.
Bug:
30188076
Test: make legacy-test and check contents of generated legacy-test artifacts
Change-Id: I75488303067c4ac34c46279bfce9a51273adcc34
Paul Duffin [Tue, 29 Nov 2016 15:01:31 +0000 (15:01 +0000)]
Merge "Use junit-host instead of junit"
Paul Duffin [Tue, 29 Nov 2016 13:00:19 +0000 (13:00 +0000)]
Use junit-host instead of junit
Bug:
30188076
Test: make checkbuild
Change-Id: I3496b9d7e40abf7712a56ba633a2becd0aa17c06
Treehugger Robot [Tue, 29 Nov 2016 14:23:03 +0000 (14:23 +0000)]
Merge "[AM] Fix system server may killed when monkey crash."
Paul Duffin [Tue, 29 Nov 2016 10:12:51 +0000 (10:12 +0000)]
Merge "Use junit-host instead of junit"
Mark Lu [Mon, 21 Nov 2016 07:38:13 +0000 (15:38 +0800)]
[AM] Fix system server may killed when monkey crash.
Symptom: monkey crash caused system server killed.
Root Cause: when monkey crash or app crash before process bound,
calling AppErrors.crashApplication will first
clear binder identities, that will caused calling pid / uid
will become with current process (i.e. system server),
so in handleAppCrashInActivityController, when monkey registered
activityController would like to kill crash process,
but not found in AMS (monkey created by app_process)
then using calling pid / uid will become to kill system server.
Solution: add calling pid / uid parameters for
handleAppCrashInActivityController to prevent binder identities
cleared case.
Test: To simulate monkey or app crash before process bound may not easy
by using simple command, but we can write a sample program to
simulate RuntimeInit to call handleApplicationCrash when met
uncauchtException,
Below is test steps in Android 7.1.1 emulator.
1. start emulator
2. after emulater started, use "adb shell am monitor" to set
activityController & monitor process by console.
3. write a .jar program as monkey by below sample code to simulate null
application binder to call handleApplicationCrash() as RuntimeInit:
package com.android.test;
import com.android.internal.os.BaseCommand;
public class SimulateMonkeyCrash extends BaseCommand {
public static void main(String[] args) {
IActivityManager am = ActivityManagerNative.getDefault();
try {
am.handleApplicationCrash(null,
new ApplicationErrorReport.CrashInfo(new Throwable()));
} catch (RemoteException e) {
e.printStackTrace();
}
}
4. write a .sh file named SimulateMonkeyCrash.sh as below:
#
base=/system
export CLASSPATH=$base/framework/SimulateMonkeyCrash.jar
exec app_process $base/bin com.android.test.SimulateMonkeyCrash "$@"
5. let .sh file is executable by "chomod 755".
6. push .jar file into /system/framework & .sh file into /system/bin
7 execute .sh file.
8. activityController will detected program crash in console as below,
press k:
Waiting after crash... available commands:
(c)ontinue: show crash dialog
(k)ill: immediately kill app
(q)uit: finish monitoring
9 you can see system server is crash.
Change-Id: Ibac4d88872f24af109d8e8522ecf5ac72fac0ce0
Treehugger Robot [Tue, 29 Nov 2016 03:08:20 +0000 (03:08 +0000)]
Merge changes I37c8daa6,I5a05b65d,If56347fd
* changes:
Preload2: Add isSingleThreaded
Preload2: Fix action inheritance
Preload2: Abstract out UI
Stephen Chen [Mon, 14 Nov 2016 23:59:33 +0000 (15:59 -0800)]
Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings.
Exposes an activity that deep links into saved network Settings.
Bug:
32738882
Test: gts test
Change-Id: Ic639b7543439bbe52941fa58a74a767a4a0f8a76
Andreas Gampe [Mon, 28 Nov 2016 23:06:35 +0000 (15:06 -0800)]
Preload2: Add isSingleThreaded
Expose whether a UI is single-threaded to avoid spawning threads
in actions.
Bug:
31961946
Test: manual
Change-Id: I37c8daa6a00784e833bad53b8e83ab4417955df7
Andreas Gampe [Mon, 28 Nov 2016 23:04:25 +0000 (15:04 -0800)]
Preload2: Fix action inheritance
Use AbstractThreadedAction as a base.
Bug:
31961946
Test: manual
Change-Id: I5a05b65d753be775c8b8382bb1a81e869c388f8d
Andreas Gampe [Mon, 28 Nov 2016 21:15:10 +0000 (13:15 -0800)]
Preload2: Abstract out UI
Create IUI interface and move UI to SwingUI.
Bug:
31961946
Test: manual
Change-Id: If56347fdde8b441c0c01337a3f5eac002ea5b4f3
Hall Liu [Mon, 28 Nov 2016 20:52:01 +0000 (20:52 +0000)]
Merge "Add removeState method to StateMachine"
Paul Duffin [Mon, 28 Nov 2016 16:44:44 +0000 (16:44 +0000)]
Use junit-host instead of junit
Bug:
30188076
Test: make checkbuild
Change-Id: I5d3efbfbe3245a631113674bff1b0aabdc9fe8be
Nicolas Geoffray [Mon, 28 Nov 2016 13:15:55 +0000 (13:15 +0000)]
Merge "Use the new refined DexOptNeeded codes."
Nicolas Geoffray [Fri, 25 Nov 2016 09:50:29 +0000 (09:50 +0000)]
Use the new refined DexOptNeeded codes.
bug:
30937355
Test: device boots, messages are printed correctly
Change-Id: Ia5274e3659471c2a52244d5838d207d407e79023
Paul Duffin [Thu, 24 Nov 2016 11:44:01 +0000 (11:44 +0000)]
Merge "Move JUnit classes from here into external/junit"
Etan Cohen [Wed, 23 Nov 2016 23:42:29 +0000 (23:42 +0000)]
Merge "[AWARE] Move manager tests from service to manager directory"
Hall Liu [Tue, 22 Nov 2016 01:29:02 +0000 (17:29 -0800)]
Add removeState method to StateMachine
Method to be used by BluetoothRouteManager in Telecom.
Test: unit tests in Telecom
Change-Id: Icdd1a3d42224246a5f26100fabb26313ce83b14c
Etan Cohen [Thu, 17 Nov 2016 01:59:41 +0000 (17:59 -0800)]
[AWARE] Move manager tests from service to manager directory
Move operation - no functional tests. Only editorial changes:
- Remove (no longer) necessary import statements
- Removed reference to a constant sitting on the service side.
Replaced with locally defined constant.
(cherry pick of commit
7ba5ad3c53dac62e56cd12dbe2054ce8374b6b92)
Bug:
32954930
Test: unit-tests pass
Change-Id: Ibe463fa73c27fc67996460eb91ea0222437927a6
Jeff Davidson [Wed, 23 Nov 2016 03:55:26 +0000 (03:55 +0000)]
Merge "Expose TelephonyManager#{set,get}DataEnabled."
Treehugger Robot [Wed, 23 Nov 2016 02:45:54 +0000 (02:45 +0000)]
Merge "Fix static analyzer warnings."
Treehugger Robot [Wed, 23 Nov 2016 01:51:51 +0000 (01:51 +0000)]
Merge "Bluetooth: report proper advertiser status on error"
Jeff Davidson [Fri, 18 Nov 2016 23:48:15 +0000 (15:48 -0800)]
Expose TelephonyManager#{set,get}DataEnabled.
setDataEnabled requires MODIFY_PHONE_STATE or carrier privileges.
getDataEnabled will work with any of the above or
ACCESS_NETWORK_STATE.
Merged-In: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Test: Exercised APIs from test app, updated and executed CTS tests
Change-Id: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Fixes:
32644451
Jakub Pawlowski [Tue, 22 Nov 2016 20:44:22 +0000 (12:44 -0800)]
Bluetooth: report proper advertiser status on error
When advertiser is not started because too many advertisers are
registered, return proper error code.
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I57384ff30132e9a7ee17dcf191ff89baa7abf1ef
Paul Duffin [Mon, 21 Nov 2016 15:26:00 +0000 (15:26 +0000)]
Move JUnit classes from here into external/junit
Checked that android.test.runner had the same classes in as
before the change.
These classes are legacy 3.8.1 classes, they are not in 4.10 at
all. They appear to have been left here by accident. Looking at
the history it appears that at one time there were copies of
JUnit 3.8.1 junit.runner classes in frameworks and
external/junit. The classes here were upgraded to 4.10 but even
though these classes had been deleted immediately after 3.8.2
was released they were not removed, instead they appear to have
been reformatted as part of the upgrade. The external/junit
source was upgraded to 4.10 about two weeks later which seems to
have been done correctly. About three months after that the
classes here that were duplicates of those in external/junit
were removed from here leaving the legacy classes from 3.8.1.
I could not find any usages of these classes and they are not in
the public API so they can probably be removed altogether.
However, for now I will simply move them into external/junit as
described and remove them when upgrading JUnit there to 4.12.
Bug:
30188076
Test: Built android.test.runner and checkapi
Change-Id: I88687889315c041d999fe7e61b9652ac8406165c
Treehugger Robot [Tue, 22 Nov 2016 09:43:23 +0000 (09:43 +0000)]
Merge "Add SystemProperties.reportSyspropChanged()."
Treehugger Robot [Tue, 22 Nov 2016 00:03:43 +0000 (00:03 +0000)]
Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration"
Treehugger Robot [Mon, 21 Nov 2016 22:23:12 +0000 (22:23 +0000)]
Merge "Make voicemail notification broadcast public"
Etan Cohen [Mon, 21 Nov 2016 21:43:39 +0000 (21:43 +0000)]
Merge "[AWARE] Update API per review"
Treehugger Robot [Mon, 21 Nov 2016 21:33:15 +0000 (21:33 +0000)]
Merge "StrictMode to detect untagged network traffic."
Jeff Sharkey [Mon, 21 Nov 2016 20:10:28 +0000 (20:10 +0000)]
Merge "Stub Binder API."
Jeff Sharkey [Mon, 21 Nov 2016 19:14:50 +0000 (12:14 -0700)]
StrictMode to detect untagged network traffic.
Define some constants for early use in AOSP code.
Test: builds, boots, all common traffic tagged
Bug:
30943431
Change-Id: Ia58a8933bccfddbc027afb78c63ae65bd71ce562
Etan Cohen [Wed, 16 Nov 2016 21:40:55 +0000 (13:40 -0800)]
[AWARE] Update API per review
- Move Handler to last position
- Peer ID changed from 'Object' -> opaque class
- Rename onMessageSent -> onMessageSendSucceeded
(cherry pick of commit
1fef08507aeb49bb2e4e7be4804a378ba2cf7770)
Bug:
31470256
Test: unit tests & integration (sl4a) tests pass
Change-Id: I5530d310e982ea16a63a5af1f704625fd24e436c
Jeff Sharkey [Mon, 21 Nov 2016 16:13:52 +0000 (09:13 -0700)]
Stub Binder API.
Provide a stub API for AOSP code to call.
Test: builds
Bug:
32715088
Change-Id: Iab74d269e795a722e82fd3fa304200d57d152f57
Martijn Coenen [Thu, 17 Nov 2016 13:06:38 +0000 (14:06 +0100)]
Add SystemProperties.reportSyspropChanged().
To support notifying libutils of system property
changes.
Bug:
31262344
Test: builds
Change-Id: Iea77532eaa84d00f7d640edd1e3a1da66afdadc5
Treehugger Robot [Mon, 21 Nov 2016 16:54:52 +0000 (16:54 +0000)]
Merge "Precreate the classloader for the WebView."
Torne (Richard Coles) [Mon, 10 Oct 2016 14:11:36 +0000 (15:11 +0100)]
Precreate the classloader for the WebView.
We want to create the classloader for the WebView in advance in the
zygote so that it can preload Java and native code for its children, but
the zygote can't talk to the package manager (so doesn't have a
PackageInfo for the APK) and also doesn't have an ActivityThread, so
constructing a LoadedApk is difficult.
Instead, we use the fact that ApplicationLoaders contains a
process-global cache of classloaders for APKs, and prepopulate a cache
entry without constructing a LoadedApk. This requires making
ApplicationLoaders public. To calculate the correct library paths from
the information the zygote has, we reuse the logic in LoadedApk (which
is already public, and just needs a small change to allow a null
ActivityThread when checking for instrumentation).
The other parameters for classloader creation (target SDK, bundled app,
etc) are hardcoded to usable values for the WebView's case. WebView
never needs to use any system libraries that aren't public so claiming
it's not bundled is fine even when that isn't actually true, and WebView
will always target the current platform API level.
Once the classloader is created, look up the factory class and call
preloadInZygote on it to give it a chance to preload the native library
and do other shared initialisation.
Bug:
21643067
Test: enable multiprocess WebView, examine librank output to see sharing
Change-Id: I696ead637e3f7382bcc58cfaf61eac5921862015
Treehugger Robot [Fri, 18 Nov 2016 23:08:55 +0000 (23:08 +0000)]
Merge "Split libhidl into base and transport."
Treehugger Robot [Fri, 18 Nov 2016 22:30:41 +0000 (22:30 +0000)]
Merge "Fix incorrect calculation of sizeof package structure"
Ping Sun [Thu, 2 Jun 2016 08:32:21 +0000 (16:32 +0800)]
Fix MSIM issue of broadcast intent overwritten unintentionally
Since the following broadcast intent is differentiated only by extra
for each SIM, if intents for Slot1 and Slot2 are sent in succession,
Slot1 intent can be overwritten, causing loss of information. To prevent
the issue, remove "FLAG_RECEIVER_REPLACE_PENDING" from intent.
- ACTION_SIGNAL_STRENGTH_CHANGED
Bug:
30296957
Change-Id: I281f8063b2bf10efe3165ea29305265bd9d3eb30
Treehugger Robot [Fri, 18 Nov 2016 20:44:14 +0000 (20:44 +0000)]
Merge "Customization of LTE Signal Bars"
Selim Cinek [Fri, 18 Nov 2016 19:39:30 +0000 (19:39 +0000)]
Merge "Share one receiver for CurrentUserTracker"
Selim Cinek [Fri, 18 Nov 2016 19:39:09 +0000 (19:39 +0000)]
Merge "Brightness mirror - fix multi-touch issue"
Treehugger Robot [Fri, 18 Nov 2016 08:45:15 +0000 (08:45 +0000)]
Merge "wifi: hotspot2: add support for validating passpoint configuration"
Chris Tate [Fri, 18 Nov 2016 01:23:31 +0000 (01:23 +0000)]
Merge "Schedule agentDisconnected() in handler thread"
Yifan Hong [Wed, 16 Nov 2016 23:48:49 +0000 (15:48 -0800)]
Split libhidl into base and transport.
Bug:
32756130
Test: mma
Change-Id: I0df309a1096b663cc51ce8badacf05e2a47836a8
Treehugger Robot [Thu, 17 Nov 2016 23:52:59 +0000 (23:52 +0000)]
Merge "Avoid starving RT anims"
John Reck [Tue, 15 Nov 2016 18:22:01 +0000 (10:22 -0800)]
Avoid starving RT anims
Test: Manual, usleep(16000) in DrawFrameTask and tap
on recents
Merged-In: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0
Change-Id: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0
Brad Ebinger [Thu, 17 Nov 2016 19:18:00 +0000 (19:18 +0000)]
Merge "Readability improvements in Logging"
Treehugger Robot [Thu, 17 Nov 2016 18:37:41 +0000 (18:37 +0000)]
Merge "Fix coretests: Remove dependency on libnativehelper"
Przemyslaw Szczepaniak [Thu, 17 Nov 2016 15:28:52 +0000 (15:28 +0000)]
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
Wan He [Thu, 17 Nov 2016 09:49:37 +0000 (17:49 +0800)]
Fix incorrect calculation of sizeof package structure
Argument "package" is a pointer, not the structure.
Signed-off-by: Wan He <xiaolin.gxl@alibaba-inc.com>
Treehugger Robot [Thu, 17 Nov 2016 06:58:42 +0000 (06:58 +0000)]
Merge "Don't disconnect an A2DP device when connecting to same device"
Pavlin Radoslavov [Thu, 17 Nov 2016 04:51:06 +0000 (20:51 -0800)]
Don't disconnect an A2DP device when connecting to same device
When processing a connect request for an A2DP device, Settings
would trigger a disconnect request for all A2DP devices that
have state of CONNECTED, CONNECTING or DISCONNECTING, including
eventually the device we are connecting to.
This could create timing-related issues, and is not necessary.
Now we explicitly check to avoid disconnecting the device we are
connecting to.
Test: Manual A2DP testing with a phone and wireless headsets
Bug:
32688022
Change-Id: I572dd87c071829b734513c4b928a4d65fe539520
Dimitry Ivanov [Thu, 17 Nov 2016 02:28:04 +0000 (18:28 -0800)]
Fix coretests: Remove dependency on libnativehelper
This dependency was never needed and it makes test app
depend on private platform libraries - which is no longer allowed.
This change fixes these problems by removing dependency and renaming
JNI method.
Test: Install the test and start it.
Change-Id: I9878627148917c1b5928b98f3c86f6e6097093d6
Treehugger Robot [Thu, 17 Nov 2016 02:10:23 +0000 (02:10 +0000)]
Merge "wifi: add constant definition for EAP types"
dooyoung.hwang [Fri, 11 Nov 2016 08:23:00 +0000 (17:23 +0900)]
Share one receiver for CurrentUserTracker
Each CurrentUserTracker has one receiver per one object.
This could cause unnecessary transaction as Tracker counts
increases. The idea of redcuing receiver is creating
one static receiver for CurrentUserTracker and share it
with all object.
Test: Check if Quicksetting order is changed properly
after switching user.
Change-Id: I8404829826391f8b315b42bbd0f50e77b783eeab
Jerry Zhang [Wed, 16 Nov 2016 23:59:32 +0000 (23:59 +0000)]
Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
* changes:
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
Clean up persistent usb state on boot.
Fixed handling of usb state during adb changes.
Treehugger Robot [Wed, 16 Nov 2016 23:42:24 +0000 (23:42 +0000)]
Merge "Add security capabilities enums to ScanResult"
Peter Qiu [Wed, 16 Nov 2016 23:17:48 +0000 (15:17 -0800)]
wifi: hotspot2: add copy constructor for PasspointConfiguration
Bug:
32714562
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ida7e4da3d6a9679743397643e0250434dbdb43af
Peter Qiu [Tue, 1 Nov 2016 21:50:59 +0000 (14:50 -0700)]
wifi: hotspot2: add support for validating passpoint configuration
Bug:
32572199
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I8e649430af54d863dfa5492abc3dfd79c772c765
Peter Qiu [Fri, 11 Nov 2016 17:18:26 +0000 (09:18 -0800)]
wifi: add constant definition for EAP types
Bug:
32810711
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ia62f2674e8cdf975d1380f733a8687bdb15ed197
Ningyuan Wang [Tue, 1 Nov 2016 22:36:10 +0000 (15:36 -0700)]
Add security capabilities enums to ScanResult
This adds enums of security parameters, including
protocol, key management, and cipher suites.
Bug:
32512793
Test: compile
Change-Id: Ibf784d79695ca5e261c6bfe623406bc693c5ac17
Brad Ebinger [Tue, 1 Nov 2016 21:11:38 +0000 (14:11 -0700)]
Readability improvements in Logging
We now truncate Session method paths and IDs based on the Logging level
to improve Session Logging readability in logcat. If another external
session is started off of an existing external Session, the preceding
histories are replaced with "..." so that the Session information is not
overwhelming.
Bug:
26571395
Test: Unit Tests and manual tests pass
Change-Id: I9ffda3d64f1072fa6228a82a86116a5e47d18c96
Yifan Hong [Wed, 16 Nov 2016 19:01:00 +0000 (19:01 +0000)]
Merge "Fix include after spliting HidlSupport.h"
Treehugger Robot [Wed, 16 Nov 2016 18:15:05 +0000 (18:15 +0000)]
Merge "Preload2: Fix dependencies"
Martijn Coenen [Wed, 16 Nov 2016 09:48:30 +0000 (09:48 +0000)]
Merge "Fix deprecated range_x calls."
Treehugger Robot [Wed, 16 Nov 2016 07:55:26 +0000 (07:55 +0000)]
Merge "CountDownTimer: not skip onTick()"
Treehugger Robot [Wed, 16 Nov 2016 02:54:25 +0000 (02:54 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA."
Yifan Hong [Wed, 16 Nov 2016 00:02:40 +0000 (16:02 -0800)]
Fix include after spliting HidlSupport.h
Test: mma
Bug:
32756130
Change-Id: Ia4fa02726d79681753fe9c8c7135a28fffb508b4
dooyoung.hwang [Tue, 15 Nov 2016 23:59:23 +0000 (08:59 +0900)]
Brightness mirror - fix multi-touch issue
The issue is that QSPanel get touch event while brightness mirros
is showing after density changes. This is because StatusBarWindowView
keeps the reference of detached brightness mirror view. We can refresh
it at onViewAdded function.
Test: manual(change device density > Check if can click QuickSettings
while dragging brightness slider.)
Change-Id: I646092abbc23b24bb91fc5c8525b12a143364b84
Treehugger Robot [Tue, 15 Nov 2016 23:50:16 +0000 (23:50 +0000)]
Merge changes from topic 'HS2 API Cleanup'
* changes:
wifi: remove unused hidden Hotspot 2.0 Release 1 API
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
Jerry Zhang [Wed, 12 Oct 2016 22:49:32 +0000 (15:49 -0700)]
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.
It also simplifies some of the code.
Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee
(cherry picked from commit
7a396be6d5ba8914933a54b5bfac25e118db0e9f)
Jerry Zhang [Tue, 18 Oct 2016 00:37:13 +0000 (17:37 -0700)]
Clean up persistent usb state on boot.
b/
31814300 was fixed, but mtp can still stick around in the
persistent config even after flashing. This block of code
will only run once, but will ensure that mtp is not in
the config after the update.
Bug:
31814300
Test: Manual
Change-Id: Icf02be38c9e1f769412ac963ed6afc14e6092bfb
(cherry-picked from commit
a45dac0e83f4f907b6b42f453181a7d5c01f65f3)
Jerry Zhang [Thu, 13 Oct 2016 01:04:03 +0000 (18:04 -0700)]
Fixed handling of usb state during adb changes.
When changing state to adb from mtp (charging), we want to disable
the old mtp function. Similarly when change to away from adb to
charging, enable the mtp function.
Also the mtp function should never be persisted.
Bug:
31818377
Bug:
31814300
Test: Manually verify that the correct usb configuration is displayed.
Test: Manually verify that logcat is not kicked during boot.
Change-Id: Idcb7f53be39ea38712d5de45b323d8daeb552129
(cherry-picked from commit
58018d01a3c384b954275d15bee7f9c52a1c7c0a)
Neil Fuller [Tue, 15 Nov 2016 16:39:42 +0000 (16:39 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting"
Martijn Coenen [Mon, 14 Nov 2016 13:56:03 +0000 (14:56 +0100)]
Fix deprecated range_x calls.
Test: builds
Change-Id: I98412e51a54ef9f9e26c72ecd810dcea77aefdbb
Treehugger Robot [Tue, 15 Nov 2016 03:59:57 +0000 (03:59 +0000)]
Merge "osu: remove calls to deprecated APIs"
Andreas Gampe [Tue, 15 Nov 2016 03:08:22 +0000 (19:08 -0800)]
Preload2: Fix dependencies
Also depend on and package tools-common.
Test: m
Test: preload-tool
Change-Id: I19a8844f87417f2292e50ffaaebb5fa24a2eca24