OSDN Git Service
TreeHugger Robot [Wed, 16 Nov 2016 07:27:52 +0000 (07:27 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 16 Nov 2016 07:25:32 +0000 (07:25 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 16 Nov 2016 05:59:01 +0000 (05:59 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 16 Nov 2016 05:30:05 +0000 (05:30 +0000)]
Merge "Use StartFuseBridgeLoop function instead of FuseBridgeLoop class."
Bill Yi [Wed, 16 Nov 2016 04:21:13 +0000 (20:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8ac518af567b4e189fbd9749482bb3e11d2dfecd
Auto-generated-cl: translation import
Scott Main [Wed, 16 Nov 2016 04:07:23 +0000 (04:07 +0000)]
Merge "Add cross-links between FINE and COARSE location permissions. bug:
25371600"
TreeHugger Robot [Wed, 16 Nov 2016 04:07:08 +0000 (04:07 +0000)]
Merge "Fixed obsolete comment."
longhai [Wed, 16 Nov 2016 03:28:17 +0000 (03:28 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am:
1813ae0159 am:
2be54fde72 am:
5c152a3d7f
am:
d7e2ae5fc7
Change-Id: I9b24f761959dfe7a88509b65273e31916d9ddfc1
TreeHugger Robot [Wed, 16 Nov 2016 03:21:14 +0000 (03:21 +0000)]
Merge changes I99813278,I6285042b
* changes:
Fix copypasta error.
Aggressively clear cached data when forgetting.
longhai [Wed, 16 Nov 2016 03:18:08 +0000 (03:18 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am:
1813ae0159 am:
2be54fde72
am:
5c152a3d7f
Change-Id: Ida06ea3d42d66cb2f1cc124fe3498e579141d16c
longhai [Wed, 16 Nov 2016 03:11:09 +0000 (03:11 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am:
1813ae0159
am:
2be54fde72
Change-Id: I14e1d5aa6bda143e2a87bba1ea65b8384c44e3a1
longhai [Wed, 16 Nov 2016 03:04:38 +0000 (03:04 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA."
am:
1813ae0159
Change-Id: Iae1a0cd25495206d596aed7d68ce7936071f9c6e
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."
Seigo Nonaka [Wed, 16 Nov 2016 02:17:54 +0000 (02:17 +0000)]
Merge "Move test only initialization to each test setup."
Daichi Hirono [Tue, 15 Nov 2016 02:27:45 +0000 (11:27 +0900)]
Use StartFuseBridgeLoop function instead of FuseBridgeLoop class.
The method is being renamed from FuseBridgeLoop::Start to StartFuseBridgeLoop
in libappfuse. The CL handles the change in the framework side.
Bug:
29970149
Test: None
Change-Id: I70b91e426fa817d84c7f1f5f24c9e3ba401e523b
Jeff Sharkey [Wed, 16 Nov 2016 00:54:23 +0000 (17:54 -0700)]
Fix copypasta error.
Test: builds
Bug:
29087651
Change-Id: I99813278bc37fa332730144f821b33ae6bd35650
Android Build Merger (Role) [Wed, 16 Nov 2016 00:45:31 +0000 (00:45 +0000)]
Merge "Merge changes from topic 'HS2 API Cleanup' am:
41fd0f1faf am:
afb8f37711 am:
2e73b06f63 am:
0fc7044d0b"
Peter Qiu [Wed, 16 Nov 2016 00:44:34 +0000 (00:44 +0000)]
Merge changes from topic 'HS2 API Cleanup' am:
41fd0f1faf am:
afb8f37711 am:
2e73b06f63
am:
0fc7044d0b
Change-Id: Ie42a4361d51ee489edc1357063516509cacddc0f
Android Build Merger (Role) [Wed, 16 Nov 2016 00:44:01 +0000 (00:44 +0000)]
Merge changes from topic 'am-
a57c7c884e184332ab6ba25437abb1a5'
* changes:
wifi: remove unused hidden Hotspot 2.0 Release 1 API am:
1c3054ea87 am:
1b39c61ce7 am:
134706940b am:
03e4bc1ead
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am:
a38558b539 am:
a9a9a9bb8d am:
31b8e658d3 am:
996986254f
Peter Qiu [Wed, 16 Nov 2016 00:42:16 +0000 (00:42 +0000)]
wifi: remove unused hidden Hotspot 2.0 Release 1 API am:
1c3054ea87 am:
1b39c61ce7 am:
134706940b
am:
03e4bc1ead
Change-Id: Ia56fb25083513ff82cda7f66f5617d02b81e96ec
Peter Qiu [Wed, 16 Nov 2016 00:41:13 +0000 (00:41 +0000)]
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am:
a38558b539 am:
a9a9a9bb8d am:
31b8e658d3
am:
996986254f
Change-Id: I647413dfcfd9dc769c484a4fa7e7eae13c66e0a0
Jorim Jaggi [Wed, 16 Nov 2016 00:40:49 +0000 (00:40 +0000)]
Merge "Fix that window was not hidden after policy hiding animation"
Svetoslav Ganov [Wed, 16 Nov 2016 00:33:12 +0000 (00:33 +0000)]
Merge "Temporary enable Build#SERIAL"
Peter Qiu [Wed, 16 Nov 2016 00:29:39 +0000 (00:29 +0000)]
Merge changes from topic 'HS2 API Cleanup' am:
41fd0f1faf am:
afb8f37711
am:
2e73b06f63
Change-Id: I0be82ec64a61f015a34ded70202c422e43825778
Svet Ganov [Wed, 16 Nov 2016 00:26:06 +0000 (16:26 -0800)]
Temporary enable Build#SERIAL
Filed STOPSHIP b/
32918547
bug:
31803186
Change-Id: I66b26e5948d19391513e007daad099f51cb64155
Peter Qiu [Wed, 16 Nov 2016 00:27:34 +0000 (00:27 +0000)]
wifi: remove unused hidden Hotspot 2.0 Release 1 API am:
1c3054ea87 am:
1b39c61ce7
am:
134706940b
Change-Id: If04a8f9005b69b9f4f38c2e0ea38b7bc6162397e
Peter Qiu [Wed, 16 Nov 2016 00:26:28 +0000 (00:26 +0000)]
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am:
a38558b539 am:
a9a9a9bb8d
am:
31b8e658d3
Change-Id: Ifce7abfb578e5b7d0a3d5c964926537e16ef3a2b
Peter Qiu [Wed, 16 Nov 2016 00:18:36 +0000 (00:18 +0000)]
Merge changes from topic 'HS2 API Cleanup' am:
41fd0f1faf
am:
afb8f37711
Change-Id: I413a4e86233f103767c24b636212faf3fba3dcf9
Peter Qiu [Wed, 16 Nov 2016 00:16:30 +0000 (00:16 +0000)]
wifi: remove unused hidden Hotspot 2.0 Release 1 API am:
1c3054ea87
am:
1b39c61ce7
Change-Id: Ia81a0d8b77a6031670b89f97d21fc29be9631fb3
Peter Qiu [Wed, 16 Nov 2016 00:14:46 +0000 (00:14 +0000)]
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am:
a38558b539
am:
a9a9a9bb8d
Change-Id: I5be1220539e5a22e4f0d4e3d52ac85c608ccb950
Peter Qiu [Wed, 16 Nov 2016 00:04:44 +0000 (00:04 +0000)]
Merge changes from topic 'HS2 API Cleanup'
am:
41fd0f1faf
Change-Id: Ic53fa2cad082484ebbbc9198511b0539dad97382
Peter Qiu [Wed, 16 Nov 2016 00:00:06 +0000 (00:00 +0000)]
wifi: remove unused hidden Hotspot 2.0 Release 1 API
am:
1c3054ea87
Change-Id: I5a13979aedb39ad347099fd25e7515b099b9ac19
Peter Qiu [Tue, 15 Nov 2016 23:59:20 +0000 (23:59 +0000)]
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
am:
a38558b539
Change-Id: I48766f0c259693496dc9b63ad0dd287b93185787
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
Sudheer Shanka [Tue, 15 Nov 2016 23:34:11 +0000 (23:34 +0000)]
Merge "Rename MountService to StorageManagerService."
Scott Main [Tue, 15 Nov 2016 23:22:32 +0000 (15:22 -0800)]
Add cross-links between FINE and COARSE location permissions.
bug:
25371600
Change-Id: I7af21b063533085ce20c51d18f118c7752fd77f0
Bill Yi [Tue, 15 Nov 2016 23:17:47 +0000 (15:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I434734cca2145f095b82b1978997f03225fcacc9
Auto-generated-cl: translation import
Jorim Jaggi [Tue, 15 Nov 2016 22:59:57 +0000 (14:59 -0800)]
Fix that window was not hidden after policy hiding animation
When we removed WindowState.isOnScreenIgnoringKeyguard we forgot
to change WindowState.isOnScreen to also check policy visibility.
Test: runtest frameworks-services -c com.android.server.wm.WindowStateTests
Test: Open camera app, make sure status bar is hidden
Change-Id: I780f50c8ed3e675f2fab623fdba4fcfc5b6f1d5b
Fixes:
32890266
Bill Yi [Tue, 15 Nov 2016 22:15:25 +0000 (14:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2e2f67c23e29e036470bbf69834d8cf15bb18a81
Auto-generated-cl: translation import
Jeff Sharkey [Tue, 15 Nov 2016 21:39:17 +0000 (14:39 -0700)]
Aggressively clear cached data when forgetting.
Otherwise the system server risks keeping open FDs to an adopted
storage device that could later be ejected.
Test: builds
Bug:
31596654
Change-Id: I6285042b4f0714dbf601c7dfa53efb704ea29d0b
Selim Gurun [Tue, 15 Nov 2016 21:19:44 +0000 (21:19 +0000)]
Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev am:
83fbb94e18
am:
ffa68753f8
Change-Id: If6e62fb5ce4de5037fb4e537cd537776d7ae5a01
Hui Shu [Tue, 15 Nov 2016 21:18:10 +0000 (21:18 +0000)]
Fix WebViewDatabase javadoc. am:
68d2cc180f
am:
1eb8a07e1b -s ours
Change-Id: Ib40d91c858f4333984e697f1b1e551d8dc9dc5d6
TreeHugger Robot [Tue, 15 Nov 2016 21:11:02 +0000 (21:11 +0000)]
Merge "Javadoc and un@hide ContentResolver#refresh and ContentProvider#refresh."
Jason Monk [Tue, 15 Nov 2016 21:04:17 +0000 (21:04 +0000)]
Merge "Protect against crash in fragment startup race"
Sudheer Shanka [Mon, 7 Nov 2016 23:41:02 +0000 (15:41 -0800)]
Rename MountService to StorageManagerService.
Bug:
30977067
Test: Existing tests pass
Change-Id: Ieac0f11c2b249dcd60441b14c1f391e6f8131d42
Jason Monk [Tue, 15 Nov 2016 20:38:30 +0000 (15:38 -0500)]
Protect against crash in fragment startup race
Because fragments can be hard.
Change-Id: I1eec2caf3729beaac2d36a97ba7cff422e546f44
Fixes:
32881893
Test: Look at device, verify no sysui crash dialog
TreeHugger Robot [Tue, 15 Nov 2016 20:28:29 +0000 (20:28 +0000)]
Merge "Null check file.list() results."
Selim Gurun [Tue, 15 Nov 2016 20:15:24 +0000 (20:15 +0000)]
Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev
am:
83fbb94e18
Change-Id: I6b7b1e04b00835ad2fde2d6d6b4b0dd6f3f81425
Hui Shu [Tue, 15 Nov 2016 20:15:17 +0000 (20:15 +0000)]
Fix WebViewDatabase javadoc.
am:
68d2cc180f
Change-Id: I811966bc364697f5c172cd9b4153d963962d8db2
Selim Gurun [Tue, 15 Nov 2016 19:57:38 +0000 (19:57 +0000)]
Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev
Fyodor Kupolov [Tue, 15 Nov 2016 19:29:09 +0000 (19:29 +0000)]
Merge "Control privileged permissions for priv-apps"
Felipe Leme [Tue, 15 Nov 2016 19:24:42 +0000 (11:24 -0800)]
Fixed obsolete comment.
Bug:
32906084
Test: not needed
Change-Id: I0c79e4ffb66405a30d3c83d2e7654cbef413f6e1
Julia Reynolds [Tue, 15 Nov 2016 19:23:28 +0000 (19:23 +0000)]
Merge "Volume slider should always show the proper level."
Brad Ebinger [Tue, 15 Nov 2016 18:58:46 +0000 (18:58 +0000)]
Merge "ims:rcs: New API change to notify EAB about UnPublish"
Andrew Sapperstein [Tue, 15 Nov 2016 18:45:06 +0000 (10:45 -0800)]
Null check file.list() results.
If there are no files in "vendor/overlay", file.list() returns
null.
Test: manual
Change-Id: I65d0c5fae3293804efa1c18d02d640f1f95c2015
Fixes:
32832139
TreeHugger Robot [Tue, 15 Nov 2016 18:44:41 +0000 (18:44 +0000)]
Merge "Don't update fragments if the manager's state doesn't change."
Andrii Kulian [Fri, 11 Nov 2016 19:14:12 +0000 (11:14 -0800)]
Fix minor issues discovered with Multi-Display tests
- NPE when launching activity on secondary display
and there is a docked stack on primary.
- Activities not finished correctly on secondary display
when it is removed.
Change-Id: If527211e8192088790d32b9673b960535e27033f
Test: See ActivityManagerDisplayTests.
Andrii Kulian [Tue, 15 Nov 2016 18:27:35 +0000 (18:27 +0000)]
Merge "Add API to launch activities on secondary displays"
Andrii Kulian [Wed, 2 Nov 2016 19:21:33 +0000 (12:21 -0700)]
Add API to launch activities on secondary displays
displayId can be specified as a part of ActivityOptions.
We will look for a valid stack on the specified display, starting
from the topmost one. If no valid stack is found, new dynamic stack
can be created on external display.
Launch stack and display id can't be set at the same time, otherwise
exception will be thrown.
Test: ActivityManagerDisplayTests
Test: #testLaunchActivityOnSecondaryDisplay
Test: #testConsequentLaunchActivity
Test: #testConsequentLaunchActivityFromSecondaryDisplay
Test: #testLaunchActivityFromAppToSecondaryDisplay
Change-Id: I8a202bc076319e23948d81b99a2c68d7b733b5e4
John Reck [Tue, 15 Nov 2016 17:15:02 +0000 (17:15 +0000)]
Merge "return 0 for allocation size if recycled"
Neil Fuller [Tue, 15 Nov 2016 17:11:40 +0000 (17:11 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting" am:
8631e19d38 am:
98f03f4980 am:
ef34053f26
am:
9103632f9d
Change-Id: I3b2b8355d80dca87a09ef97027753bcd568cff14
Neil Fuller [Tue, 15 Nov 2016 17:04:37 +0000 (17:04 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting" am:
8631e19d38 am:
98f03f4980
am:
ef34053f26
Change-Id: I3724485cc956b2d5a64a6e71f325181d5fdbcccf
Neil Fuller [Tue, 15 Nov 2016 16:57:32 +0000 (16:57 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting" am:
8631e19d38
am:
98f03f4980
Change-Id: Ia6592370da446e43896fb56d12f734841e137d49
Neil Fuller [Tue, 15 Nov 2016 16:50:29 +0000 (16:50 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting"
am:
8631e19d38
Change-Id: I70533c5ff4ac8cdeef1b42337bb47b09c8bbf927
George Mount [Wed, 2 Nov 2016 21:33:18 +0000 (14:33 -0700)]
Don't update fragments if the manager's state doesn't change.
Bug
32610133
A change in behavior was introduced in which the dispatch* methods
moved the state of the manager's fragments even when the manager's
state doesn't change.
Test: I88f5a3313ad05429167c417b840f888f86fd1c11
Change-Id: Ie260b1c57fae505b2636ff7572a493a92449dff4
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"
TreeHugger Robot [Tue, 15 Nov 2016 15:28:44 +0000 (15:28 +0000)]
Merge "Enforce line-wrapping in DeviceAdminReceiver.java"
TreeHugger Robot [Tue, 15 Nov 2016 14:35:39 +0000 (14:35 +0000)]
Merge "add event type enum to proto def"
Julia Reynolds [Tue, 15 Nov 2016 14:21:05 +0000 (14:21 +0000)]
Merge "Remove 'until next alarm'." into nyc-mr2-dev am:
fd5f6e9446
am:
a167322e66
Change-Id: Ia591935f33c21a9578c201da5f342f798afa73da
Julia Reynolds [Tue, 15 Nov 2016 14:19:52 +0000 (14:19 +0000)]
Remove 'until next alarm'. am:
5edde5f18a
am:
177a976a69
Change-Id: Ibc7fa4b34ea4822e61c78477007cef862dfe0127
Julia Reynolds [Mon, 14 Nov 2016 18:13:08 +0000 (13:13 -0500)]
Volume slider should always show the proper level.
Even if the phone is in vibrate mode.
Test: manual
Change-Id: Ie5a996ac2a43920b62aac0402e597a1babf3c289
Julia Reynolds [Tue, 15 Nov 2016 14:13:23 +0000 (14:13 +0000)]
Merge "Remove 'until next alarm'." into nyc-mr2-dev
am:
fd5f6e9446
Change-Id: I9cfa68615af9415265955d62a924d8fb9ddb2d80
Julia Reynolds [Tue, 15 Nov 2016 14:13:18 +0000 (14:13 +0000)]
Remove 'until next alarm'.
am:
5edde5f18a
Change-Id: I0f247f52155f78cefe0d2e850e9d5f1ca65dfb42
Julia Reynolds [Tue, 15 Nov 2016 14:06:35 +0000 (14:06 +0000)]
Merge "Remove 'until next alarm'." into nyc-mr2-dev
Jerome Gaillard [Tue, 15 Nov 2016 14:00:42 +0000 (14:00 +0000)]
Merge "Fix testActivity on buildbot"
Gustav Sennton [Tue, 15 Nov 2016 12:53:57 +0000 (12:53 +0000)]
Merge "Dump the entire state of WebViewUpdateService on demand."
TreeHugger Robot [Tue, 15 Nov 2016 05:14:56 +0000 (05:14 +0000)]
Merge "Use layered version of graphic buffer allocation calls."
Peter Qiu [Tue, 15 Nov 2016 04:37:56 +0000 (04:37 +0000)]
Merge "osu: remove calls to deprecated APIs" am:
e9514808d7 am:
30874ed6ed am:
0a5b88e286
am:
6966f450a2 -s ours
Change-Id: I786dfe46041dbf9c73e07b1fd20f9f720b3fbcb5
Peter Qiu [Tue, 15 Nov 2016 04:30:20 +0000 (04:30 +0000)]
Merge "osu: remove calls to deprecated APIs" am:
e9514808d7 am:
30874ed6ed
am:
0a5b88e286
Change-Id: Ifb54b8061a70851a8989fae30466f87822e05943
Peter Qiu [Tue, 15 Nov 2016 04:23:21 +0000 (04:23 +0000)]
Merge "osu: remove calls to deprecated APIs" am:
e9514808d7
am:
30874ed6ed
Change-Id: I43093bf243cb249ad892bdf94ea9781ca734e239
Peter Qiu [Tue, 15 Nov 2016 04:15:59 +0000 (04:15 +0000)]
Merge "osu: remove calls to deprecated APIs"
am:
e9514808d7
Change-Id: If7c31b7d901ef8cc8561b7f0933d803498105e75
Treehugger Robot [Tue, 15 Nov 2016 03:59:57 +0000 (03:59 +0000)]
Merge "osu: remove calls to deprecated APIs"
Svetoslav Ganov [Tue, 15 Nov 2016 03:48:59 +0000 (03:48 +0000)]
Merge "Add WiFi toggle prompts - framework" into stage-aosp-master am:
9f078049cf am:
05149e69cb
am:
a30eb89ead
Change-Id: If91048fb75a0d095541193d3e054d99a1304edb4
Svetoslav Ganov [Tue, 15 Nov 2016 03:48:01 +0000 (03:48 +0000)]
Add WiFi toggle prompts - framework am:
6c3032f16b am:
23328d9714
am:
afb49d395e
Change-Id: I7a5a76e9220f261248607be34f63335c9fcb4b0a
Svetoslav Ganov [Tue, 15 Nov 2016 03:41:14 +0000 (03:41 +0000)]
Merge "Add WiFi toggle prompts - framework" into stage-aosp-master am:
9f078049cf
am:
05149e69cb
Change-Id: Ib284befe74e6bca8b3c75e5c33dec1ba23eab898
Svetoslav Ganov [Tue, 15 Nov 2016 03:40:16 +0000 (03:40 +0000)]
Add WiFi toggle prompts - framework am:
6c3032f16b
am:
23328d9714
Change-Id: I629311080b90402a3919dcd3c7b49291800a398b
Sunny Goyal [Tue, 15 Nov 2016 03:33:42 +0000 (03:33 +0000)]
Merge "Preventing widgets from exceeding Bitmap memory limit"
Svetoslav Ganov [Tue, 15 Nov 2016 03:28:20 +0000 (03:28 +0000)]
Merge "Add WiFi toggle prompts - framework" into stage-aosp-master
am:
9f078049cf
Change-Id: I28501fc58e597c1f5e9d4da6bfaa3a015cad1260
Svetoslav Ganov [Tue, 15 Nov 2016 03:27:22 +0000 (03:27 +0000)]
Add WiFi toggle prompts - framework
am:
6c3032f16b
Change-Id: Ie89a9b91b8b1cd7158a743d8b5870d8f9d6f8adc
Yifan Hong [Tue, 15 Nov 2016 03:26:51 +0000 (03:26 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am:
8cc1343724 am:
2187dc5ca1 am:
41579ea4d4
am:
8afcb67a89
Change-Id: Ib6657958538c75814f9e5afd17c9446e3a8ff7fe
Yifan Hong [Tue, 15 Nov 2016 03:19:19 +0000 (03:19 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am:
8cc1343724 am:
2187dc5ca1
am:
41579ea4d4
Change-Id: Ia8f41eb4c76c241088a4cce368409bd61deb5d35
TreeHugger Robot [Tue, 15 Nov 2016 03:18:21 +0000 (03:18 +0000)]
Merge "Add WiFi toggle prompts - framework" into stage-aosp-master
Yifan Hong [Tue, 15 Nov 2016 03:12:43 +0000 (03:12 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am:
8cc1343724
am:
2187dc5ca1
Change-Id: If0919864026c78fed76df1554235c2acca9f2750
Yifan Hong [Tue, 15 Nov 2016 03:06:44 +0000 (03:06 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
am:
8cc1343724
Change-Id: If003adc06673d8e6c6db6f8a5d858dcca7aed109
Treehugger Robot [Tue, 15 Nov 2016 02:59:51 +0000 (02:59 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
Svetoslav Ganov [Wed, 27 Jul 2016 01:23:01 +0000 (18:23 -0700)]
Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
bug:
28715749
Original-Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Change-Id: I3fdc2b02abecaf3166614b0cb9fac3553cb7ab88
(cherry picked from commit
d3663c04a721e0848dd3e9179c84ba585d91839d)
Peter Qiu [Mon, 14 Nov 2016 23:18:09 +0000 (15:18 -0800)]
osu: remove calls to deprecated APIs
The hidden APIs WifiManager#addPasspointManagmentObject and
WifiManager#addPasspointManagementObject will removed, so remove
all callsites.
The OSU app is still under developement and is not included
in any device builds. However, it is being built by the Treehugger
for generic AOSP builds.
So fix it to allow the API removal CLs to be submitted.
Bug:
32509661
Test: None
Merged-In: Ic405695ee8edfd0c08b831834797f163fe445595
Change-Id: If418c64e69f1836575257b9d5b2f5c4373050a31
Fyodor Kupolov [Wed, 9 Nov 2016 22:32:27 +0000 (14:32 -0800)]
Control privileged permissions for priv-apps
Added support for privapp-permissions config element. It allows to explicitly
control what privileged permissions applications should be granted.
Feature is controlled by ro.control_privapp_permissions property.
Possible values:
- 0/false, the feature is completely disabled - signature|privileged
permissions are granted automatically without logging. *Default behavior*
- 1/true, enforce that only whitelisted permissions are granted. Only
devices with ro.control_privapp_permission=1 will pass CTS tests.
Test: Manual
Bug:
31008485
Change-Id: I93a8c2782cc72b3953f32c237086d08d82ac0d5b
Seigo Nonaka [Mon, 14 Nov 2016 05:07:41 +0000 (14:07 +0900)]
Move test only initialization to each test setup.
Global default typeface initialization is only used by test code.
It is good to do in test and remove from production.
Test: ran hwuimicro hwui_unit_tests hwuimacro
Change-Id: I7090b1794828072112540b4e357a6d24bf8f664a
Selim Cinek [Tue, 15 Nov 2016 01:39:25 +0000 (01:39 +0000)]
Fixed a bug with the emergency affordance in multi user am:
b8a7f78d24 am:
6cc0b517ba am:
96d4aadb4c
am:
23067d83d5
Change-Id: I531d9e49ca42e49ee0f9e31722748501e558e7b1
OSDN Git Service
