Fan Zhang
bb6f84699e
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev
...
am: 940f6a9962
2017-04-25 04:55:45 +00:00
Todd Kennedy
3627c9479a
Merge "fix check for provider resolution" into oc-dev
...
am: ade1496f96
2017-04-25 04:48:26 +00:00
Fan Zhang
940f6a9962
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev
2017-04-25 04:48:23 +00:00
TreeHugger Robot
ade1496f96
Merge "fix check for provider resolution" into oc-dev
2017-04-25 04:44:55 +00:00
lei.xa.liu
9af8f27ef9
Merge "Remove redundant lockscreen shown check" into oc-dev
...
am: 90c3489525
2017-04-25 04:33:15 +00:00
Wale Ogunwale
a805e2cc22
Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev
...
am: f4472b6507
2017-04-25 04:31:17 +00:00
TreeHugger Robot
90c3489525
Merge "Remove redundant lockscreen shown check" into oc-dev
2017-04-25 04:26:31 +00:00
TreeHugger Robot
f4472b6507
Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev
2017-04-25 04:25:33 +00:00
Chris Forbes
d8b8a23dc9
Merge "jni: Adjust for libui gralloc flags change" into oc-dev
...
am: 3b7c1a32f1
2017-04-25 04:19:27 +00:00
TreeHugger Robot
3b7c1a32f1
Merge "jni: Adjust for libui gralloc flags change" into oc-dev
2017-04-25 04:12:30 +00:00
Svetoslav Ganov
f9b00d77b8
Merge "Move child package feature behind sys prop" into oc-dev
...
am: 6b3263a6e2
2017-04-25 04:03:19 +00:00
Svetoslav Ganov
6b3263a6e2
Merge "Move child package feature behind sys prop" into oc-dev
2017-04-25 03:59:00 +00:00
Etan Cohen
b1e35762b9
Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev
...
am: 14ff091a1d
2017-04-25 03:32:56 +00:00
Etan Cohen
14ff091a1d
Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev
2017-04-25 03:26:07 +00:00
Ta-wei Yen
683624afd2
Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev
...
am: 3db7350d7d
2017-04-25 03:00:33 +00:00
TreeHugger Robot
3db7350d7d
Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev
2017-04-25 02:55:20 +00:00
Eugene Susla
d0e822894b
Remove 'via Bluetooth' from the choosed dialog
...
am: b7aec13d51
2017-04-25 02:53:02 +00:00
Chris Forbes
f2c44a3735
jni: Adjust for libui gralloc flags change
...
Change-Id: I94b95fba5e6234a07d2beba1d6f487842399367f
Bug: b/33350696
Test: Bullhead: booted to launcher, take photo, watch youtube
2017-04-25 02:16:51 +00:00
Eugene Susla
b7aec13d51
Remove 'via Bluetooth' from the choosed dialog
...
We no longer limit the items in a single chooser dialog to a devices from
single medium type.
Test: Ensure the dialog UI reflects the change.
Change-Id: Ia2342861f51f89e870f1c6a7fbebf9c1a37cac6a
2017-04-24 17:43:44 -07:00
Svet Ganov
a3c4eb35b1
Move child package feature behind sys prop
...
Now one can do adb shell setprop/getptop to change
"persist.sys.child_packages_enabled" to true/false to
control whether child packages are supported.
Test: manual
bug:36107077
Change-Id: Ie60e255fd3c248905906cdd5b10adae074c0b717
2017-04-25 00:19:53 +00:00
Android Build Merger (Role)
e7e7a1655a
Merge "Merge "Check Bluetooth app id instead of uid" am: 7d4a354fd5 am: 0efa055590 am: 6e7afc78a7" into oc-dev-plus-aosp
2017-04-24 23:47:15 +00:00
Amith Yamasani
e0d5680284
Merge "Check Bluetooth app id instead of uid" am: 7d4a354fd5 am: 0efa055590
...
am: 6e7afc78a7
2017-04-24 23:46:28 +00:00
Jean-Michel Trivi
c2c0008c68
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev
...
am: 9e55fcbdc2
2017-04-24 23:44:22 +00:00
Amith Yamasani
6e7afc78a7
Merge "Check Bluetooth app id instead of uid" am: 7d4a354fd5
...
am: 0efa055590
2017-04-24 23:42:27 +00:00
Jean-Michel Trivi
9e55fcbdc2
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev
2017-04-24 23:39:45 +00:00
Amith Yamasani
0efa055590
Merge "Check Bluetooth app id instead of uid"
...
am: 7d4a354fd5
2017-04-24 23:36:58 +00:00
Adam Lesinski
085abab5ba
Merge changes I7d2b7e50,I784406a6 into oc-dev
...
am: 76831f7e39
2017-04-24 23:31:26 +00:00
Treehugger Robot
7d4a354fd5
Merge "Check Bluetooth app id instead of uid"
2017-04-24 23:30:53 +00:00
TreeHugger Robot
76831f7e39
Merge changes I7d2b7e50,I784406a6 into oc-dev
...
* changes:
AAPT2: Allow truncating of package names
AAPT2: Make BinaryResourceParser more lenient
2017-04-24 23:26:06 +00:00
Felipe Leme
8ecd9c47f7
Merge "Minor fixes on Autofill Framework:" into oc-dev
...
am: 0fe852080e
2017-04-24 23:20:34 +00:00
Felipe Leme
0fe852080e
Merge "Minor fixes on Autofill Framework:" into oc-dev
2017-04-24 23:10:52 +00:00
Etan Cohen
1945f3ad2e
Merge "[AWARE] Remove match style API" into oc-dev
...
am: 2be0a532bf
2017-04-24 23:07:42 +00:00
Felipe Leme
85d1c2d290
Minor fixes on Autofill Framework:
...
- Removed default implementation of onProvideAutofillVirtualStructure() that
was using accessibility API (it's useless because without the View calling
AutofillManager.notifyViewEntered(), it would never be triggered).
- Fixed obsolete TODOs.
- Removed obsolete service class name constant.
- Removed unused debug constant.
Fixes: 37078783
Fixes: 33197203
Bug: 33802548
Bug: 35956626
Test: CtsAutoFillServiceTestCases pass
Merged-In: I834d34b8af8bf0d781dc7e0ffcd6e600bfa2d183
Change-Id: I834d34b8af8bf0d781dc7e0ffcd6e600bfa2d183
2017-04-24 16:01:12 -07:00
Etan Cohen
2be0a532bf
Merge "[AWARE] Remove match style API" into oc-dev
2017-04-24 22:59:26 +00:00
Ruben Brunk
80e2f403d2
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev
...
am: d8f13bbc3d
2017-04-24 22:53:53 +00:00
Ruben Brunk
d8f13bbc3d
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev
2017-04-24 22:49:10 +00:00
Chien-Yu Chen
2fd83ae977
Merge "camera: Update for enableZsl values in template" into oc-dev
...
am: 06d84c3a86
2017-04-24 22:41:49 +00:00
TreeHugger Robot
06d84c3a86
Merge "camera: Update for enableZsl values in template" into oc-dev
2017-04-24 22:36:54 +00:00
Jeff Sharkey
8ec71a639b
Merge "Bunch of new API lint rules." into oc-dev
...
am: 57b999605c
2017-04-24 22:25:17 +00:00
Jeff Sharkey
57b999605c
Merge "Bunch of new API lint rules." into oc-dev
2017-04-24 22:18:56 +00:00
Wale Ogunwale
f8b513e652
Merge "Fixed transition animation from pipable activities" into oc-dev
...
am: 3fc176913a
2017-04-24 21:51:51 +00:00
TreeHugger Robot
3fc176913a
Merge "Fixed transition animation from pipable activities" into oc-dev
2017-04-24 21:46:33 +00:00
Karthik Ravi Shankar
875c8445a8
Merge changes from topic 'virtual-display-api' into oc-dev
...
am: 13ba34bf37
2017-04-24 21:39:45 +00:00
Jeff Sharkey
9652eef0b2
Merge "Even more auto-doc work." into oc-dev
...
am: 880f4f4cc2
2017-04-24 21:38:03 +00:00
TreeHugger Robot
13ba34bf37
Merge changes from topic 'virtual-display-api' into oc-dev
...
* changes:
Add command line option to set compatibility display properties
Make VR mode virtual display properties customizable
2017-04-24 21:33:59 +00:00
TreeHugger Robot
880f4f4cc2
Merge "Even more auto-doc work." into oc-dev
2017-04-24 21:33:18 +00:00
Kang Li
1a297e53dc
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev
...
am: 925d3cf211
2017-04-24 21:31:25 +00:00
Julia Reynolds
521f6b46f2
Merge "Don't allow devs to create blocked channels" into oc-dev
...
am: 10e7275965
2017-04-24 21:27:39 +00:00
Julia Reynolds
b61659e291
Merge "Don't consider uri empty a valid sound" into oc-dev
...
am: db5f5c3a17
2017-04-24 21:25:55 +00:00
Kang Li
925d3cf211
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev
2017-04-24 21:21:42 +00:00
