OSDN Git Service
Ben Wagner [Mon, 20 Mar 2017 14:17:48 +0000 (14:17 +0000)]
Merge "Use access directly instead of sk_exists."
Philipp Weiß [Mon, 20 Mar 2017 12:03:03 +0000 (12:03 +0000)]
Merge "Finalize Strings and Icon for Network Logging Notification"
Narayan Kamath [Mon, 20 Mar 2017 11:12:10 +0000 (11:12 +0000)]
Merge "TelephonyManager: Avoid unnecessary object allocation." am:
5d3f14fe02 am:
088df2bd0a
am:
20fa635f7b
Change-Id: I1008a22a437b46d4830ef89189d43db0e3d07c45
Narayan Kamath [Mon, 20 Mar 2017 11:04:17 +0000 (11:04 +0000)]
Merge "TelephonyManager: Avoid unnecessary object allocation." am:
5d3f14fe02
am:
088df2bd0a
Change-Id: I0af6c22b2c7418553a70d49f9d67393b51abd37f
Narayan Kamath [Mon, 20 Mar 2017 10:57:52 +0000 (10:57 +0000)]
Merge "TelephonyManager: Avoid unnecessary object allocation."
am:
5d3f14fe02
Change-Id: If425a64fe7820579045dfa40b356792f24d0de43
Andrei Stingaceanu [Mon, 20 Mar 2017 10:53:39 +0000 (10:53 +0000)]
Merge "AutoSize TextView (part 12) - ellipsize & more fixes"
Narayan Kamath [Mon, 20 Mar 2017 10:49:16 +0000 (10:49 +0000)]
Merge "TelephonyManager: Avoid unnecessary object allocation."
Roozbeh Pournader [Mon, 20 Mar 2017 02:59:20 +0000 (02:59 +0000)]
Merge "Read emoji addtions from data file"
TreeHugger Robot [Sun, 19 Mar 2017 03:28:02 +0000 (03:28 +0000)]
Merge "Grumble, apps should check features before using."
TreeHugger Robot [Sun, 19 Mar 2017 01:45:48 +0000 (01:45 +0000)]
Merge "Use allocatable space when measuring for install."
Charlie Tsai [Sun, 19 Mar 2017 01:18:34 +0000 (01:18 +0000)]
Merge "Replace rectangle shadow algorithm"
Jeff Sharkey [Sat, 18 Mar 2017 23:54:51 +0000 (17:54 -0600)]
Use allocatable space when measuring for install.
The system is often willing to clear cached data to make room for
incoming installs, so use StorageManager.getAllocatableBytes() when
making "does it fit?" style decisions.
Add new INSTALL_ALLOCATE_AGGRESSIVE flag, which will flow through
to use StorageManager.FLAG_ALLOCATE_AGGRESSIVE when making allocation
related requests. (This can be used by installers to indicate
packages that are critical to system health or security.
Test: runtest -x frameworks/base/core/tests/coretests/src/android/content/pm/PackageHelperTests.java
Bug:
36131437
Change-Id: If8118762fd1ca1f497d2cdd1787bdb3c9759dcc0
Jeff Sharkey [Sat, 18 Mar 2017 22:48:02 +0000 (16:48 -0600)]
Grumble, apps should check features before using.
Turns out several apps are blindly grabbing a FINGERPRINT_SERVICE
reference without checking to see if the device actually includes
that feature.
Hand pre-O apps a stubbed out Manager instance, but keep the new
ServiceNotFoundException behavior intact going forward, since it
prevents race conditions during boot or Binder service restarts.
Test: builds, boots
Bug:
32566669
Change-Id: Id1c0873e98e59b255f32e0f9204f4525a345f9ef
Jeff Sharkey [Sat, 18 Mar 2017 22:39:24 +0000 (16:39 -0600)]
Only query storage stats when package installed.
Otherwise we're just wasting our time (since the sizes will be zero),
and we'll get yelled at by an exception.
Test: builds, boots, no longer crashes
Bug:
36308874
Change-Id: I113d37e4a9ec00b8cb74321104c1ea1f836aa6f4
Charlie Tsai [Thu, 2 Mar 2017 18:39:45 +0000 (18:39 +0000)]
Replace rectangle shadow algorithm
Test: Rectangle Shadow test
Change-Id: Id9635df8769e85d835dc6f99201b86e5bba110d2
TreeHugger Robot [Sat, 18 Mar 2017 17:36:57 +0000 (17:36 +0000)]
Merge "Add TRON logs"
TreeHugger Robot [Sat, 18 Mar 2017 17:10:58 +0000 (17:10 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 18 Mar 2017 17:05:49 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 18 Mar 2017 17:04:41 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 18 Mar 2017 16:30:01 +0000 (16:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 18 Mar 2017 13:56:16 +0000 (06:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8f6d28da56a19b5b7275602cb435ff74499818bd
Auto-generated-cl: translation import
Chris Wren [Fri, 17 Mar 2017 21:18:11 +0000 (17:18 -0400)]
revise the reader semantics
checkpoint modifies the underlying log rather than reading timestamps.
reset replays without going back to the underlying log.
add a test
Bug:
32982362
Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Change-Id: I381b203a1c24fcd098d7df4d9d0a50bd8aaa1309
Bill Yi [Sat, 18 Mar 2017 08:40:55 +0000 (01:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I570e874a9059d3ecd42dc668e3c2a051e5e369b2
Auto-generated-cl: translation import
Bill Yi [Sat, 18 Mar 2017 08:21:03 +0000 (01:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I820e686def44fb4442c531f0c7fac97094fc8af4
Auto-generated-cl: translation import
Bill Yi [Sat, 18 Mar 2017 08:12:18 +0000 (01:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I28fd5eb6a213d19e6d9266a167b26c6eaa12d880
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 18 Mar 2017 03:04:23 +0000 (03:04 +0000)]
Merge "Removed redundant call to session.removeSelf()"
TreeHugger Robot [Sat, 18 Mar 2017 01:33:07 +0000 (01:33 +0000)]
Merge "Fix NPE when config is updated before ViewRootImpl is set"
Roozbeh Pournader [Sat, 18 Mar 2017 01:23:23 +0000 (18:23 -0700)]
Read emoji addtions from data file
We now read the emoji additions from a data file, instead of keeping
them in code.
Test: updated lint script passes.
Change-Id: Ica1ca10eaba0ca2b4a178d08354e31729cb88ce5
TreeHugger Robot [Sat, 18 Mar 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Update Emoji.java to use ICU"
Chris Tate [Sat, 18 Mar 2017 00:39:53 +0000 (00:39 +0000)]
Merge "Correctly check expired jobs against active ones"
Brian Carlstrom [Sat, 18 Mar 2017 00:39:47 +0000 (00:39 +0000)]
Merge "Warn when ActivityManagerService.dumpStackTraces times out"
Doris Ling [Sat, 18 Mar 2017 00:39:04 +0000 (00:39 +0000)]
Merge "Update battery settings summary text."
Felipe Leme [Fri, 17 Mar 2017 23:55:02 +0000 (16:55 -0700)]
Removed redundant call to session.removeSelf()
Bug:
35721501
Test: CtsAutoFillServiceTestCases pass
Change-Id: I625c08bd8f9f673892387c703082c3eb5b2fd48d
TreeHugger Robot [Sat, 18 Mar 2017 00:05:12 +0000 (00:05 +0000)]
Merge changes Ic359aaee,Id7aba066
* changes:
AOD: Use color filter to invert icons for AOD
NotificationWrappers: Factor out doze treatment
TreeHugger Robot [Fri, 17 Mar 2017 23:57:06 +0000 (23:57 +0000)]
Merge changes Iab3f9914,I5d5da5e7
* changes:
Average scan results for AccessPoints.
Fix broken AccessPointTests.
Andrii Kulian [Fri, 17 Mar 2017 21:58:36 +0000 (14:58 -0700)]
Fix NPE when config is updated before ViewRootImpl is set
If activity received a configuration change before it had its
ViewRootImpl initialize, then there was a NPE when trying to
notify the ViewRootImpl instance about latest changes.
Bug:
36396248
Test: android.server.cts.ActivityManagerAppConfigurationTests
Test: #testLaunchWithUiModeChange
Test: Launch AndroidAuto app
Change-Id: I71e0f316f885a30dadce388bbd3d9f21f419076b
fionaxu [Fri, 17 Mar 2017 23:50:47 +0000 (23:50 +0000)]
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent" am:
7f8d27f84b am:
4aadda1902
am:
606f1ae931
Change-Id: I345b2853acca9e0165c2bf26d885ff794b734d69
fionaxu [Fri, 17 Mar 2017 23:44:09 +0000 (23:44 +0000)]
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent" am:
7f8d27f84b
am:
4aadda1902
Change-Id: I5c01a75cbb65b8374548c18c5139f9d892e14f49
fionaxu [Fri, 17 Mar 2017 23:34:49 +0000 (23:34 +0000)]
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent"
am:
7f8d27f84b
Change-Id: Ia1216368a2a2a4959283d95bbc4be26789f151f6
TreeHugger Robot [Fri, 17 Mar 2017 23:25:15 +0000 (23:25 +0000)]
Merge "Getting ephemeral flag from PackageManager when UidRecord is null"
Treehugger Robot [Fri, 17 Mar 2017 23:24:28 +0000 (23:24 +0000)]
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent"
TreeHugger Robot [Fri, 17 Mar 2017 23:23:56 +0000 (23:23 +0000)]
Merge "format cleanup(intellij)"
Calin Juravle [Fri, 17 Mar 2017 23:22:41 +0000 (23:22 +0000)]
Merge "Compile secondary dex files according to REASON_BACKGROUND_DEXOPT"
Adam Lesinski [Fri, 17 Mar 2017 23:19:04 +0000 (23:19 +0000)]
Merge changes from topic 'configForSplit'
* changes:
libandroidfw: Search all packages for an identifier
AAPT2: Finish support for feature splits
Add support for configForSplit
Android Build Merger (Role) [Fri, 17 Mar 2017 23:12:00 +0000 (23:12 +0000)]
Merge "Merge "Ota: Add command logging" am:
9a8d78dc86 am:
8dd991a7ef am:
c47f92b374"
TreeHugger Robot [Fri, 17 Mar 2017 23:11:41 +0000 (23:11 +0000)]
Merge "Better call emulation for DevicePolicyManagerTest"
Andreas Gampe [Fri, 17 Mar 2017 23:11:11 +0000 (23:11 +0000)]
Merge "Ota: Add command logging" am:
9a8d78dc86 am:
8dd991a7ef
am:
c47f92b374
Change-Id: I6038dc9afd05c375bd1c6933b2aa5882f7835174
Android Build Merger (Role) [Fri, 17 Mar 2017 23:10:41 +0000 (23:10 +0000)]
Merge "Merge "Bluetooth 5 move timeout parameter (1/2)" am:
d9f2f67a5f am:
07d79aa3b0 am:
acd3953ea1"
Jakub Pawlowski [Fri, 17 Mar 2017 23:09:10 +0000 (23:09 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)" am:
d9f2f67a5f am:
07d79aa3b0
am:
acd3953ea1
Change-Id: Ic2c7bd33d558bb4e8cfff063c95f2fa137aeaae0
TreeHugger Robot [Fri, 17 Mar 2017 23:07:27 +0000 (23:07 +0000)]
Merge "Fix ArrayMap.get vs ArrayMap.valueAt typo"
TreeHugger Robot [Fri, 17 Mar 2017 23:06:09 +0000 (23:06 +0000)]
Merge "Show friction icons in Saved Networks list."
TreeHugger Robot [Fri, 17 Mar 2017 23:04:30 +0000 (23:04 +0000)]
Merge "Remove U+1F93B MODERN PENATHLON and U+1F946 RIFLE from emoji"
Andreas Gampe [Fri, 17 Mar 2017 22:53:33 +0000 (22:53 +0000)]
Merge "Ota: Add command logging" am:
9a8d78dc86
am:
8dd991a7ef
Change-Id: I7a5061a98c33abbae787a42079c41263dbcdc7cb
TreeHugger Robot [Fri, 17 Mar 2017 22:49:17 +0000 (22:49 +0000)]
Merge "Update fontchain_lint.py to read Emoji 5.0 data"
Andreas Gampe [Fri, 17 Mar 2017 22:45:34 +0000 (22:45 +0000)]
Merge "Ota: Add command logging"
am:
9a8d78dc86
Change-Id: I48b887a26c8f8123c112559da0f74112bb703b1c
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:41:35 +0000 (22:41 +0000)]
Merge "Add new precise call fail causes and OEM causes" am:
9aa841d254 am:
4992b1533e
am:
a7c4fdbf03
Change-Id: Iea9ee9c4a407638dfa19669b25d0c1534978d4a6
Jakub Pawlowski [Fri, 17 Mar 2017 22:41:00 +0000 (22:41 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)" am:
d9f2f67a5f
am:
07d79aa3b0
Change-Id: I5f75034690784dd06d54345e60107ab7049e4da7
Treehugger Robot [Fri, 17 Mar 2017 22:35:47 +0000 (22:35 +0000)]
Merge "Ota: Add command logging"
Jakub Pawlowski [Fri, 17 Mar 2017 22:34:24 +0000 (22:34 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)"
am:
d9f2f67a5f
Change-Id: Iee7d485461f5e02ab65ec9f7311e962deb603543
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:34:01 +0000 (22:34 +0000)]
Merge "Add new precise call fail causes and OEM causes" am:
9aa841d254
am:
4992b1533e
Change-Id: I00c97934ad59e996844831ee23ace60813d3ce0c
TreeHugger Robot [Fri, 17 Mar 2017 22:33:14 +0000 (22:33 +0000)]
Merge "Update references to removed APIs"
Adrian Roos [Wed, 8 Mar 2017 23:26:14 +0000 (15:26 -0800)]
AOD: Use color filter to invert icons for AOD
Fixes an issue where the AOD icons where of different
brightness because they were converted to grayscale and
then inverted. Now we just set the appropriate color filter
instead.
Change-Id: Ic359aaee2e19274670f44c5b7380c636ee26e559
Test: Open AOD, observe that the icons are colored solid white (like the clock) instead of gray.
Fixes:
35850204
Adrian Roos [Wed, 8 Mar 2017 22:58:33 +0000 (14:58 -0800)]
NotificationWrappers: Factor out doze treatment
Bug:
35850204
Test: receive a notification group, observe that the group icon is correctly inverted on ambient display.
Change-Id: Id7aba066eb1683705fdc2c008e657bd819ddd31d
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:27:11 +0000 (22:27 +0000)]
Merge "Add new precise call fail causes and OEM causes"
am:
9aa841d254
Change-Id: I2b52c9c332fc73a37ac2c4c492ac9b85b2025897
Jakub Pawlowski [Fri, 17 Mar 2017 22:24:04 +0000 (22:24 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)"
Jakub Pawlowski [Fri, 17 Mar 2017 18:12:15 +0000 (11:12 -0700)]
Bluetooth 5 move timeout parameter (1/2)
Timeout is not a parameter, it is a property of enabling the
advertising. Move it into more proper place.
Test: manual
Bug:
30622771
Change-Id: I09ebc6c770bc02938ea16a9738a7e03dc8006fde
Peter Qiu [Fri, 17 Mar 2017 22:23:30 +0000 (22:23 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration" am:
5bd337397b am:
8951172562
am:
79ff52975f
Change-Id: I80cdbc7f0140e6085c06cab8eaba63e1fc455538
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:18:22 +0000 (22:18 +0000)]
Merge "Add new precise call fail causes and OEM causes"
Peter Qiu [Fri, 17 Mar 2017 22:16:22 +0000 (22:16 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration" am:
5bd337397b
am:
8951172562
Change-Id: I3799156a83400d9fa1aa07a4afd935bd9c0f683b
Roozbeh Pournader [Fri, 17 Mar 2017 22:08:47 +0000 (15:08 -0700)]
Update Emoji.java to use ICU
Overrides have been added to update the data to Emoji 5.0, since our
version of ICU only supports Emoji 4.0.
Test: CTS tests continue to pass.
Bug:
27365282
Bug:
30874706
Change-Id: I7c791e1e75ea3510b36f258c1e1c7184051d6d3a
Peter Qiu [Fri, 17 Mar 2017 22:08:21 +0000 (22:08 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration"
am:
5bd337397b
Change-Id: I8db5f02e6c6ab6b03de5ae3cff39619f85963e9b
Yohei Yukawa [Fri, 17 Mar 2017 22:05:16 +0000 (22:05 +0000)]
Merge "Deprecate IMM#showSoftInputUnchecked() part 1"
Treehugger Robot [Fri, 17 Mar 2017 21:57:15 +0000 (21:57 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration"
fionaxu [Fri, 17 Mar 2017 21:35:39 +0000 (14:35 -0700)]
remove deprecated SIM_ACTIVATION_REQUEST intent
This deprecated intent voilates intent naming conventions as defined in CDD.
Bug:
35271104
Test: Manual
Change-Id: Ic7f251a6471de31e17960d612e108203983ce32d
TreeHugger Robot [Fri, 17 Mar 2017 21:46:08 +0000 (21:46 +0000)]
Merge "Fix libplatformproto includes/export includes"
TreeHugger Robot [Fri, 17 Mar 2017 21:38:47 +0000 (21:38 +0000)]
Merge "Make SYNC_PARENT_SOUNDS a @SystemApi"
Roozbeh Pournader [Fri, 17 Mar 2017 19:40:20 +0000 (12:40 -0700)]
Remove U+1F93B MODERN PENATHLON and U+1F946 RIFLE from emoji
These had remained in Emoji.java although they were removed from Unicode
emoji. The data still needs to be updated to Emoji 5.0, but that will be
done in another CL.
Test: not needed
Bug:
28678294
Change-Id: I491c4bba107b960fb1efccbe19630ab274aa6e29
Doris Ling [Fri, 17 Mar 2017 21:37:24 +0000 (14:37 -0700)]
Update battery settings summary text.
Bug:
36375846
Test: builds
Change-Id: I9d0cf831327960d69296de5b025e18c6f1f6a2ae
TreeHugger Robot [Fri, 17 Mar 2017 21:34:58 +0000 (21:34 +0000)]
Merge "Code clean up: remove some dead code."
Suprabh Shukla [Thu, 16 Mar 2017 22:37:36 +0000 (15:37 -0700)]
Getting ephemeral flag from PackageManager when UidRecord is null
When a user switches off background running for an app that was already
stopped, UidRecord is null when passed in to
AcitivityManager#doStopUidLocked resulting in an NPE. We need to get
ephemeral state flag from package manager in such cases.
Test: Manual
Bug:
36158380
Change-Id: Id77848c252cc0ff0c803113ac2c7c19aa0dcf254
Brian Carlstrom [Tue, 14 Mar 2017 07:58:26 +0000 (00:58 -0700)]
Warn when ActivityManagerService.dumpStackTraces times out
Test: Insert hang into art/runtime/signal_catcher.cc after "reacting to signal"
Bug:
35962833
Change-Id: Ia5444e7e23b3fc34f233ce8cc083d44b284a6cdc
Ben Wagner [Fri, 17 Mar 2017 21:22:01 +0000 (17:22 -0400)]
Use access directly instead of sk_exists.
Skia would like to move SkOSFile and make it private spi. This appears
to be the only place SkOSFile is used outside Skia, and using access
here directly is more apropriate.
Test: Simple inline refactor, built and ran. Changes test code only.
Change-Id: Ib76c180bb3bccc54c20dcadc842837e3e8270929
Alan Viverette [Fri, 17 Mar 2017 21:01:58 +0000 (21:01 +0000)]
Merge "Allow the support library to add its own droiddoc options"
Andreas Gampe [Fri, 17 Mar 2017 20:59:08 +0000 (13:59 -0700)]
Ota: Add command logging
Log the next command.
Bug:
25612095
Test: m
Change-Id: I284a2fb3e329afcb0b03f7162585b0eefe13eb0e
Todd Kennedy [Fri, 17 Mar 2017 20:55:38 +0000 (13:55 -0700)]
Add TRON logs
Add logs for instant app resolution [both phase 1 & 2]
as well as new logs for all activity starts.
Change-Id: I0d25daa383854eacd3bc406ce1360d819a8ec4ba
Fixes:
35442251
Fixes:
35441725
Test: Manual; install/run instant app and inspect the event logs for appropriate tags
TreeHugger Robot [Fri, 17 Mar 2017 20:48:28 +0000 (20:48 +0000)]
Merge "Send broadcast when user restrictions change."
Alan Viverette [Fri, 17 Mar 2017 20:46:20 +0000 (16:46 -0400)]
Update references to removed APIs
Test: make PRODUCT-sdk_google_aw_x86-sdk
Change-Id: I8e13f43520e609808a9825fa3c89f4233076c5a9
Christopher Tate [Wed, 15 Mar 2017 19:01:22 +0000 (12:01 -0700)]
Correctly check expired jobs against active ones
If a job was run before its deadline, and then the deadline landed
while the job was still running, b/c of the 'deadline trumps all'
it would be considered eligible to run again as soon as the previous
iteration completed.
Fix this by checking against the state of the active queue.
Bug
36253320
Test: CTS: job scheduler TimingConstraintsTest
Change-Id: I4f0c1012091bf88776cfe725d7b59f6dcf602c02
Brian Carlstrom [Fri, 17 Mar 2017 20:32:59 +0000 (20:32 +0000)]
Merge "Dump native stack for background ANR if process is of interest"
Sundeep Ghuman [Thu, 16 Mar 2017 02:06:14 +0000 (19:06 -0700)]
Average scan results for AccessPoints.
This reduces jitter in the WifiTracker and is modeled after a prior
broken implementation which attempted to half-life the rssi each time
AccessPoint.update(ScanResult) is called.
Bug:
34774783
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: Iab3f9914af40f2fd56e8ae7b45dcbd62176c8a67
TreeHugger Robot [Fri, 17 Mar 2017 20:22:36 +0000 (20:22 +0000)]
Merge "QS: Revert change to when user switcher is shown"
Dan Willemsen [Fri, 17 Mar 2017 20:05:20 +0000 (13:05 -0700)]
Fix libplatformproto includes/export includes
The host versions of these were pointing to the target generated
sources, without having proper dependencies added. But the build system
already handles these adding these to your local and exported include
directories, so just remove them.
Bug:
36365556
Test: m -j libhwui incident_report incident-section-gen
Change-Id: I52024508eabd8d10899c307c950fe045ff66ab25
Makoto Onuki [Fri, 17 Mar 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Fix deadlock between activity manager and settings provider"
Fan Zhang [Fri, 17 Mar 2017 19:55:21 +0000 (12:55 -0700)]
Code clean up: remove some dead code.
Test: existing tests pass
Change-Id: I1e0e6f8218b3a6550476fe1aa092f685d7433d53
Alan Viverette [Fri, 17 Mar 2017 19:47:09 +0000 (19:47 +0000)]
Merge "Revert "Changing initial and default focus behavior""
Sundeep Ghuman [Wed, 15 Mar 2017 23:03:55 +0000 (16:03 -0700)]
Show friction icons in Saved Networks list.
Bug: b/
34802842
Test: $ make SettingsFunctionalTests -j40
$ adb install -r
$ {OUT}/data/app/SettingsFunctionalTests/SettingsFunctionalTests.apk
$ adb shell am instrument -w \
'android.settings.functional/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I0d6aedad2aabb40ef532283a755cb5c954e8139d
Sundeep Ghuman [Thu, 16 Mar 2017 03:09:47 +0000 (20:09 -0700)]
Fix broken AccessPointTests.
Bug: None
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I5d5da5e7e0faf1c124816f0dd8ab5f0249e54637
Robin Lee [Fri, 17 Mar 2017 12:50:24 +0000 (12:50 +0000)]
Better call emulation for DevicePolicyManagerTest
Let's have several separate contexts instead of doing strange things
with package names in one monolithic context representing every single
user on the device at once, sometimes multiple times in the same call.
Syntax looks like:
runAsCaller(callerContext, dpms, (dpm) -> {
assertSomething(dpm.doSomething(caller, param));
});
When a caller calls into DevicePolicyManager here's what happens:
PRE
- a new DevicePolicyManager is created with the caller context
- service context callingIdentity is saved
- the callingUid, callingPid, and callingPermissions are added to the service context
TEST
- client-side test code interacts with DevicePolicyManager using the caller context
- server-side coder under test runs as DevicePolicyManagerService using the service context
POST
- service context callingIdentity is restored to what it was before the test.
This should be easier to reason about.
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases
Change-Id: I148e3f298b0a958639ce261e9cf91f6eb49fae4d
Peter Qiu [Fri, 17 Mar 2017 16:39:11 +0000 (09:39 -0700)]
hotspot2: implement toString for PasspointConfiguration
Bug:
35850988
Test: Verify contents in "adb shell dumpsys"
Change-Id: Idabe65d505eb15113aba06dc05c879861b94b2af
Conrad Chen [Fri, 17 Mar 2017 19:39:37 +0000 (19:39 +0000)]
Merge "Block modifying types of channels"