Peter Qiu
98595e7718
Merge "hotspot2: implement toString for PasspointConfiguration" am: 5bd337397b am: 8951172562
...
am: 79ff52975f
2017-03-17 22:23:30 +00:00
Peter Qiu
79ff52975f
Merge "hotspot2: implement toString for PasspointConfiguration" am: 5bd337397b
...
am: 8951172562
2017-03-17 22:16:22 +00:00
Peter Qiu
8951172562
Merge "hotspot2: implement toString for PasspointConfiguration"
...
am: 5bd337397b
2017-03-17 22:08:21 +00:00
Yohei Yukawa
2565a526a8
Merge "Deprecate IMM#showSoftInputUnchecked() part 1"
2017-03-17 22:05:21 +00:00
Treehugger Robot
5bd337397b
Merge "hotspot2: implement toString for PasspointConfiguration"
2017-03-17 21:57:16 +00:00
TreeHugger Robot
a46d977849
Merge "Fix libplatformproto includes/export includes"
2017-03-17 21:46:12 +00:00
TreeHugger Robot
9e284db838
Merge "Make SYNC_PARENT_SOUNDS a @SystemApi"
2017-03-17 21:38:51 +00:00
TreeHugger Robot
6c3489bc29
Merge "Code clean up: remove some dead code."
2017-03-17 21:35:02 +00:00
Alan Viverette
44277fbd61
Merge "Allow the support library to add its own droiddoc options"
2017-03-17 21:02:03 +00:00
TreeHugger Robot
ef8297e275
Merge "Send broadcast when user restrictions change."
2017-03-17 20:48:36 +00:00
Brian Carlstrom
dd08db08ff
Merge "Dump native stack for background ANR if process is of interest"
2017-03-17 20:33:04 +00:00
TreeHugger Robot
57efc93f08
Merge "QS: Revert change to when user switcher is shown"
2017-03-17 20:22:40 +00:00
Dan Willemsen
349907c1ad
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
2017-03-17 13:05:20 -07:00
Makoto Onuki
f87e234488
Merge "Fix deadlock between activity manager and settings provider"
2017-03-17 19:59:06 +00:00
Fan Zhang
51fac1237d
Code clean up: remove some dead code.
...
Test: existing tests pass
Change-Id: I1e0e6f8218b3a6550476fe1aa092f685d7433d53
2017-03-17 12:55:21 -07:00
Alan Viverette
42b0676d61
Merge "Revert "Changing initial and default focus behavior""
2017-03-17 19:47:13 +00:00
Peter Qiu
89537734e1
hotspot2: implement toString for PasspointConfiguration
...
Bug: 35850988
Test: Verify contents in "adb shell dumpsys"
Change-Id: Idabe65d505eb15113aba06dc05c879861b94b2af
2017-03-17 12:44:13 -07:00
Conrad Chen
96f6a1a7d6
Merge "Block modifying types of channels"
2017-03-17 19:39:44 +00:00
Evan Rosky
cfd6c85d42
Revert "Changing initial and default focus behavior"
...
This is a soft revert.
This reverts commit 37df2dbab1
2017-03-17 12:39:15 -07:00
TreeHugger Robot
741a898514
Merge "Adding an extras Bundle to MessagingStyle messages."
2017-03-17 19:38:02 +00:00
TreeHugger Robot
13a8b79755
Merge "Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays"
2017-03-17 19:19:45 +00:00
Robin Lee
c74d85fee8
Make SYNC_PARENT_SOUNDS a @SystemApi
...
Since there is a CTS test depending on it which is currently hardcoding
the string. Let's not do that.
Bug: 30658854
Test: make full -j30
Change-Id: I6f6b1044ac664589b8fe76ced9961e80024b0b29
2017-03-17 19:11:20 +00:00
Makoto Onuki
73360ab2d1
Fix deadlock between activity manager and settings provider
...
Test: manual
Bug 36028906
Change-Id: I20344608d79d174b468506056789c04d3bde510f
2017-03-17 11:59:45 -07:00
Jason Monk
84caab7bdb
QS: Revert change to when user switcher is shown
...
Its making it inconsistently show up on the lock screen. Until
final behavior is decided, revert to old behavior.
Change-Id: Ifc69f2d5b527cc9ce5a174b16b8b605db26fc35b
Fixes: 36141544
Test: visual
2017-03-17 14:49:47 -04:00
Diego Perez
37ecda0eba
Merge "Fix BitmapShader to work with adaptive icons"
2017-03-17 18:01:30 +00:00
TreeHugger Robot
9f7958c17f
Merge "Disable large-ish parcel logging."
2017-03-17 17:57:30 +00:00
TreeHugger Robot
2fb89f45b9
Merge "Removed 'virtual' from autofill method names."
2017-03-17 17:54:37 +00:00
TreeHugger Robot
6e4075bde6
Merge "Adding enabled state for remote actions."
2017-03-17 17:51:45 +00:00
Roshan Pius
b2312cdbb6
Merge "WifiConfiguration: Correct documentation for priority" am: f5fa26bf25 am: da34226f06
...
am: 9205ccf3ee
2017-03-17 17:40:54 +00:00
Roshan Pius
f817fbce16
Merge "WifiConfiguration: Update psk documentation" am: 89c79ff632 am: 6b6f1b9e12
...
am: 28212c1b29
2017-03-17 17:39:37 +00:00
Roshan Pius
9205ccf3ee
Merge "WifiConfiguration: Correct documentation for priority" am: f5fa26bf25
...
am: da34226f06
2017-03-17 17:34:10 +00:00
Roshan Pius
28212c1b29
Merge "WifiConfiguration: Update psk documentation" am: 89c79ff632
...
am: 6b6f1b9e12
2017-03-17 17:33:06 +00:00
Andrii Kulian
e6ac20e1c7
Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays
...
MANAGE_ACTIVITY_STACKS permission allows moving stacks, tasks and
activities between corresponding parents. It makes no sense to
require more strict START_ANY_ACTIVITY permission to launch on
private display, as an activity still can be moved to it.
Bug: 34164473
Test: 'adb unroot' and run android.server.cts.ActivityManagerDisplayTests
Change-Id: I3b59127829c432e42a46630025eeddd152bce1b0
2017-03-17 10:30:50 -07:00
Roshan Pius
da34226f06
Merge "WifiConfiguration: Correct documentation for priority"
...
am: f5fa26bf25
2017-03-17 17:28:13 +00:00
Roshan Pius
6b6f1b9e12
Merge "WifiConfiguration: Update psk documentation"
...
am: 89c79ff632
2017-03-17 17:26:57 +00:00
TreeHugger Robot
1c10a61a97
Merge "Allow Instant Apps access PackageInfo of exposed apps"
2017-03-17 17:26:24 +00:00
Treehugger Robot
f5fa26bf25
Merge "WifiConfiguration: Correct documentation for priority"
2017-03-17 17:18:32 +00:00
Treehugger Robot
89c79ff632
Merge "WifiConfiguration: Update psk documentation"
2017-03-17 17:17:50 +00:00
Tomasz Wasilczyk
3d19f90c32
Merge "Add getProgramList call to the broadcast radio API."
2017-03-17 16:34:55 +00:00
Jerome Gaillard
3ce947f482
Merge "Update ColorFilter_Delegate following Change I5f74addd"
2017-03-17 16:29:36 +00:00
Jeff Sharkey
f5299f1b88
Disable large-ish parcel logging.
...
This logging was originally added to track down very large log
messages that were causing Binder transactions to fail. We fixed
a handful of bugs that could have been causing this over in 32575987,
so this logging should no longer be needed in live builds. (In fact,
this logging is being triggered often enough to push other important
debugging information out of logs.)
Test: builds, boots
Bug: 36372780
Change-Id: I640192fbec35693673a2f22b7a82ce54f27937da
2017-03-17 10:25:10 -06:00
TreeHugger Robot
837c927213
Merge "Fix up QS edit UI"
2017-03-17 16:11:36 +00:00
Felipe Leme
81f01d9efd
Removed 'virtual' from autofill method names.
...
Fixes: 36126001
Test: VirtualContainerActivityTest pass
Change-Id: I3b8fe835cd7c7f39c8e2cb8f2daca71b03236a1f
2017-03-17 09:09:31 -07:00
Neil Fuller
ff8b79e162
Merge "Track library change in libcore." am: ed9c176e16 am: 301f1d3645
...
am: cef08e7482
2017-03-17 15:50:31 +00:00
Brian Carlstrom
66524247d4
Dump native stack for background ANR if process is of interest
...
Bug: 30112521
Bug: 36043456
Bug: 35241370
Test: make -j32 -k && flashall
Change-Id: I25b134ec24c534f3cfeb5a7c43195da3a6285d57
2017-03-17 08:48:52 -07:00
Roshan Pius
651b264b3d
WifiConfiguration: Correct documentation for priority
...
Addressing the concerns raised by API council for deprecating this
field.
Bug: 35854198
Test: make update-api
Change-Id: If9ca582f5d3bd8539a226b425662832241a447cc
2017-03-17 08:44:06 -07:00
Neil Fuller
cef08e7482
Merge "Track library change in libcore." am: ed9c176e16
...
am: 301f1d3645
2017-03-17 15:44:05 +00:00
Roshan Pius
cbd0c76ad0
WifiConfiguration: Update psk documentation
...
Adding some documentation to explain the expected contents of this
field.
Bug: 35967623
Test: make update-api
Change-Id: Ia28e2c79834c4d7b0de7350c18d5f32633e6309d
2017-03-17 08:40:17 -07:00
Andrii Kulian
c1b59ed73e
Merge "Separate global and override config sent to client"
2017-03-17 15:39:37 +00:00
Neil Fuller
301f1d3645
Merge "Track library change in libcore."
...
am: ed9c176e16
2017-03-17 15:38:01 +00:00
