TreeHugger Robot
6fd52cd04b
Merge "Introduced UserDataPreparer class"
2017-01-27 20:57:33 +00:00
Android Build Merger (Role)
e3eb296cb4
Merge "Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b am: e163e7b943 am: bb15b50ffc am: aa70426388"
2017-01-27 20:51:34 +00:00
TreeHugger Robot
463160177b
Merge "SysUI: Fix race condition that is causing test failure"
2017-01-27 20:50:36 +00:00
Adrian Roos
cd4fa97afc
Merge "AOD: Fix DirectReply"
2017-01-27 20:50:03 +00:00
Tomasz Wasilczyk
3ce0308695
Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b am: e163e7b943 am: bb15b50ffc
...
am: aa70426388
2017-01-27 20:49:44 +00:00
Jason Long
3c12e8f723
Merge "Rename metrics_constants.proto DEFAULT_AUTOFILL_PICKER."
2017-01-27 20:47:20 +00:00
TreeHugger Robot
3f5d1ec256
Merge "Account for null client certificate"
2017-01-27 20:46:18 +00:00
Tomasz Wasilczyk
aa70426388
Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b am: e163e7b943
...
am: bb15b50ffc
2017-01-27 20:43:24 +00:00
Tomasz Wasilczyk
bb15b50ffc
Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b
...
am: e163e7b943
2017-01-27 20:38:55 +00:00
TreeHugger Robot
0ee455a899
Merge "Convert native changing config flags to Java flags"
2017-01-27 20:38:39 +00:00
TreeHugger Robot
21b80c2f81
Merge "Moved LinkTextView to settingslib"
2017-01-27 20:35:34 +00:00
Tomasz Wasilczyk
e163e7b943
Merge "Use the new radio_metadata wrapper for safer memory management."
...
am: a9ed0b1c8b
2017-01-27 20:32:52 +00:00
Tomasz Wasilczyk
a9ed0b1c8b
Merge "Use the new radio_metadata wrapper for safer memory management."
2017-01-27 20:26:08 +00:00
TreeHugger Robot
977b106de6
Merge "Notification: Fix Ambient view text color"
2017-01-27 20:17:28 +00:00
TreeHugger Robot
ef92186d45
Merge "Fix broken lock screen affordances"
2017-01-27 20:17:12 +00:00
TreeHugger Robot
7d670b4f73
Merge "OMS: introduce the OverlayManagerService"
2017-01-27 19:42:59 +00:00
Android Build Merger (Role)
3bec1cf5a5
Merge "Merge "Switch to listening for all network changes." am: 085ffa76fa am: 46f8abd229 am: 118c0c9e7d am: 8aba32468a"
2017-01-27 19:40:46 +00:00
Erik Kline
e17a1754ed
Merge "Switch to listening for all network changes." am: 085ffa76fa am: 46f8abd229 am: 118c0c9e7d
...
am: 8aba32468a
2017-01-27 19:39:31 +00:00
TreeHugger Robot
f8150a33bf
Merge "Add tooltip for the search button in SearchView"
2017-01-27 19:39:17 +00:00
Android Build Merger (Role)
edc5db9bf7
Merge "Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am: e924640c4b am: b0f03a64ea am: 221e58fe95 -s ours am: 83b3c5994e"
2017-01-27 19:39:12 +00:00
Brad Ebinger
71c07ed6c9
Merge "Adds @hide ImsResolver API and device overlays (2/3)"
2017-01-27 19:38:48 +00:00
Shukang Zhou
a3a36dc327
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am: e924640c4b am: b0f03a64ea am: 221e58fe95 -s ours
...
am: 83b3c5994e
2017-01-27 19:38:30 +00:00
Erik Kline
8aba32468a
Merge "Switch to listening for all network changes." am: 085ffa76fa am: 46f8abd229
...
am: 118c0c9e7d
2017-01-27 19:33:16 +00:00
Shukang Zhou
83b3c5994e
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am: e924640c4b am: b0f03a64ea
...
am: 221e58fe95
2017-01-27 19:32:24 +00:00
TreeHugger Robot
27abaf483a
Merge "AOD: Refine ambient notification view"
2017-01-27 19:28:24 +00:00
Chih-hung Hsieh
cd57014151
Merge "Work around clang-tidy segmentation fault."
2017-01-27 19:28:15 +00:00
Adrian Roos
f552cc32a7
AOD: Refine ambient notification view
...
Bug: 30876804
Test: manual
Change-Id: I63599e674a4e6794a2ff730736244c2f71720e8e
2017-01-27 19:27:23 +00:00
Erik Kline
118c0c9e7d
Merge "Switch to listening for all network changes." am: 085ffa76fa
...
am: 46f8abd229
2017-01-27 19:20:19 +00:00
Erik Kline
46f8abd229
Merge "Switch to listening for all network changes."
...
am: 085ffa76fa
2017-01-27 19:14:39 +00:00
Fyodor Kupolov
5c0ecfdb37
Introduced UserDataPreparer class
...
Extracted the logic for preparing and destroying user data into a new
class. Unit tests will be added in a follow up cl.
Test: manual + UserManagerTest
Bug: 34736064
Change-Id: I4df7189c4ad8703cb34f54da21873b9ec83589c5
2017-01-27 11:11:57 -08:00
Treehugger Robot
085ffa76fa
Merge "Switch to listening for all network changes."
2017-01-27 19:07:08 +00:00
Adrian Roos
4320e89ffa
AOD: Fix DirectReply
...
Test: Receive notification with RemoteInput on Ambient Display, tap the action with the remote input. Observe that the device wakes up, unlocks and opens the RemoteInput.
Bug: 34500641
Change-Id: Iabb3ca0b33944cdf41c798852ff68cd74489bff4
2017-01-27 11:06:50 -08:00
TreeHugger Robot
ffc7b78434
Merge "Reparent the activity in the task with associated window containers."
2017-01-27 19:05:57 +00:00
Shukang Zhou
221e58fe95
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am: e924640c4b
...
am: b0f03a64ea
2017-01-27 19:01:44 +00:00
Shukang Zhou
b0f03a64ea
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."
...
am: e924640c4b
2017-01-27 18:57:12 +00:00
TreeHugger Robot
cd7b114f14
Merge "Fixed the logic for tethering provisioning re-evaluation"
2017-01-27 18:53:46 +00:00
Treehugger Robot
e924640c4b
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."
2017-01-27 18:49:45 +00:00
Jason Monk
809aadf69e
SysUI: Fix race condition that is causing test failure
...
Test: runtest systemui
Change-Id: I7f3bf7bbcc75820231fd59ca20551ac377dea601
2017-01-27 13:46:51 -05:00
Adrian Roos
72171629e6
Notification: Fix Ambient view text color
...
Change-Id: Ib45e2288932939896bb05fc1dc606e3551dd951d
Test: Trigger Ambient Display, check text is readable.
Fixes: 34767438
2017-01-27 10:42:20 -08:00
Paul Stewart
410a3498ac
Account for null client certificate
...
If a null certificate is passed to setClientKeyEntry() we should
not pass a non-null array with a single null element to the
setClientKeyEntryWithCertificateChain helper method. Instead we
should pass a null array.
Bug: 34765004
Test: cts-tradefed run cts -d --module CtsNetTestCases --test android.net.wifi.cts.WifiEnterpriseConfigTest
Change-Id: I02793b4b29bc7325f98833c58bf652ba68353827
2017-01-27 10:39:39 -08:00
Jason Monk
9ef7307324
Fix broken lock screen affordances
...
The state change callback stopped getting added as part of the
dependency injection refactor, which turns out has a pretty serious
effect on how the buttons work.
Change-Id: Ic2c412248373de80acc581d09e3073f541238e9a
Fixes: 34739383
Test: Click on lock screen mic or camera
2017-01-27 13:34:17 -05:00
Julia Reynolds
1af50e2da1
Merge "Show channel groups in settings"
2017-01-27 18:22:15 +00:00
Tomasz Wasilczyk
aee690ffad
Use the new radio_metadata wrapper for safer memory management.
...
Bug: b/34054813
Test: VTS, manual - both done in internal branch
Change-Id: I5f4962f86b7732e14c2584a562e9737c92310697
2017-01-27 09:40:35 -08:00
Jack Yu
16485b8963
Fixed the logic for tethering provisioning re-evaluation
...
Previously we only re-evaluate provisioning for SIM swap case
The new logic covers both SIM swap case
(ABSENT->NOT_READY->UNKNOWN->READY->LOADED) and modem reset
case (NOT_READY->READY->LOADED)
Test: Manual
bug: 33815946
Change-Id: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
2017-01-27 09:30:26 -08:00
Jason Monk
df9a4f9a7c
Merge "Add secondaryContentAlpha"
2017-01-27 17:25:15 +00:00
Winson Chung
3048004087
Reparent the activity in the task with associated window containers.
...
- Currently moveActivityToStack() adds the activity to the top of the
new task in the new stack, but the code path to update the window
container controllers assumes that they are in the same task and
attempts to position it by index. Instead, we should properly
reparent the activity in the new task (just like we reparent tasks
into new stacks), and also reparent the associated app window tokens
into their new tasks on the WM side.
- Also should fix an issue when trying to reparent an activity from one
task to another task by affinity.
Bug: 34394702
Test: AppWidgetContainerControllerTests#testReparent
Test: android.server.cts.ActivityManagerPinnedStackTests#testEnterPipFromTaskWithMultipleActivities
Change-Id: Ib767f85eb4f469cfd1c108c55242996325bdb866
2017-01-27 17:23:57 +00:00
Adrian Roos
adb520570f
Merge "AOD: Prevent KeyguardAffordanceViews from triggering in doze"
2017-01-27 17:12:02 +00:00
Android Build Merger (Role)
0e73e5c4ff
Merge "Merge "Add hidden API for whether permission review mode is on. am: 7b89a7b1f7 am: 90e9bbc814" into nyc-mr2-dev-plus-aosp am: b20b9d84d2"
2017-01-27 17:08:37 +00:00
TreeHugger Robot
035e5d4278
Merge "add a comparator for LogMaker"
2017-01-27 17:08:23 +00:00
Paul Navin
c1e53401aa
Merge "Add hidden API for whether permission review mode is on. am: 7b89a7b1f7 am: 90e9bbc814" into nyc-mr2-dev-plus-aosp
...
am: b20b9d84d2
2017-01-27 17:07:23 +00:00
