OSDN Git Service
Narayan Kamath [Thu, 27 Apr 2017 09:54:11 +0000 (09:54 +0000)]
Merge "ActivityManager: Remove vestigial support for mDidDexOpt."
TreeHugger Robot [Thu, 27 Apr 2017 08:00:12 +0000 (08:00 +0000)]
Merge "Fix doc flag for device having multiple storages"
Kang Li [Thu, 27 Apr 2017 07:40:13 +0000 (07:40 +0000)]
Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using colons in their customized annotations." into oc-dev am:
6b36aeb491
am:
f595898fca
Change-Id: I970ac51e7f71cf15ce710956f698c27d463b107e
Kang Li [Thu, 27 Apr 2017 07:33:39 +0000 (07:33 +0000)]
Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using colons in their customized annotations." into oc-dev
am:
6b36aeb491
Change-Id: Id08aa99bc81d260731fae25457b30e648171b291
TreeHugger Robot [Thu, 27 Apr 2017 07:26:09 +0000 (07:26 +0000)]
Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using colons in their customized annotations." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 06:54:46 +0000 (06:54 +0000)]
Merge "Remove uses of SkBitmap::copyTo"
Steve McKay [Thu, 27 Apr 2017 06:40:08 +0000 (06:40 +0000)]
Merge "Address API Council feedback." into oc-dev am:
f147688149
am:
eebe305a52
Change-Id: I9345ac184b1257c7750a3cd3eb46603394d470bb
Steve McKay [Thu, 27 Apr 2017 06:33:19 +0000 (06:33 +0000)]
Merge "Address API Council feedback." into oc-dev
am:
f147688149
Change-Id: I3f4e3f74058b1f1e0af4cf5a2c095fb0c265c003
TreeHugger Robot [Thu, 27 Apr 2017 06:26:00 +0000 (06:26 +0000)]
Merge "Address API Council feedback." into oc-dev
Eugene Susla [Thu, 27 Apr 2017 06:09:53 +0000 (06:09 +0000)]
Merge "Expose Companion API via shell command" into oc-dev am:
60c17e06e8
am:
0b035e657d
Change-Id: Idbff58ecfc8b65f8c6cfcef068f1c91c33c0ff4a
Eugene Susla [Thu, 27 Apr 2017 06:03:59 +0000 (06:03 +0000)]
Merge "Expose Companion API via shell command" into oc-dev
am:
60c17e06e8
Change-Id: I0d8301000f9fef4a2c13ae64798d13bb16029878
Hugo Benichi [Thu, 27 Apr 2017 06:01:38 +0000 (06:01 +0000)]
Merge "NsdService: bootstrap unit tests" am:
7ca060aa95 am:
dd53c962b2 am:
d29ce6ae8c
am:
e2377c88e3
Change-Id: I018d6fbface4a9d4a568486dedd30d05e0ddd949
TreeHugger Robot [Thu, 27 Apr 2017 05:55:58 +0000 (05:55 +0000)]
Merge "Expose Companion API via shell command" into oc-dev
Hugo Benichi [Thu, 27 Apr 2017 05:49:47 +0000 (05:49 +0000)]
Merge "NsdService: bootstrap unit tests" am:
7ca060aa95 am:
dd53c962b2
am:
d29ce6ae8c
Change-Id: Iaf0679790e934baaaf48bcb04098aa18deca4d60
Joe Fernandez [Thu, 27 Apr 2017 05:44:35 +0000 (05:44 +0000)]
Merge "docs: Update EditText JavaDoc comments" into oc-dev am:
cc7f08e997
am:
81a1217b71
Change-Id: I662863c366fafe6b9744eb3e7ae4c336f3f136a1
Hugo Benichi [Thu, 27 Apr 2017 05:42:36 +0000 (05:42 +0000)]
Merge "NsdService: bootstrap unit tests" am:
7ca060aa95
am:
dd53c962b2
Change-Id: If2782297ecd3b6bef8d8be5b1427aed8fcdb7aee
Joe Fernandez [Thu, 27 Apr 2017 05:42:27 +0000 (05:42 +0000)]
Merge "docs: Update Button JavaDoc comments" into oc-dev am:
1e5d0768cd
am:
bb2eecd532
Change-Id: I3c58c206192fd1f92c66f5a8ae6251c99d2f04d8
Hugo Benichi [Thu, 27 Apr 2017 05:34:05 +0000 (05:34 +0000)]
Merge "NsdService: bootstrap unit tests"
am:
7ca060aa95
Change-Id: I3ce2d85afb5e085c8c49731f3d18a96d17542271
Joe Fernandez [Thu, 27 Apr 2017 05:33:23 +0000 (05:33 +0000)]
Merge "docs: Update EditText JavaDoc comments" into oc-dev
am:
cc7f08e997
Change-Id: I756fae9374b0bd2f30c7c1a856acdc09fe249adb
Joe Fernandez [Thu, 27 Apr 2017 05:31:24 +0000 (05:31 +0000)]
Merge "docs: Update Button JavaDoc comments" into oc-dev
am:
1e5d0768cd
Change-Id: Ice1626bc12b0b605a97c8d921c352c5e600bc43a
TreeHugger Robot [Thu, 27 Apr 2017 05:24:46 +0000 (05:24 +0000)]
Merge "docs: Update EditText JavaDoc comments" into oc-dev
Hugo Benichi [Thu, 27 Apr 2017 05:22:52 +0000 (05:22 +0000)]
Merge "NsdService: bootstrap unit tests"
Felipe Leme [Thu, 27 Apr 2017 05:21:36 +0000 (05:21 +0000)]
Merge "Autofill binding permission fixes." into oc-dev am:
d915c42150
am:
bd67d13bfc
Change-Id: I714263ccec13b4e96f30b180340b9087f900ae0b
TreeHugger Robot [Thu, 27 Apr 2017 05:21:17 +0000 (05:21 +0000)]
Merge "docs: Update Button JavaDoc comments" into oc-dev
Julia Reynolds [Thu, 27 Apr 2017 05:15:11 +0000 (05:15 +0000)]
Merge "Api updates" into oc-dev am:
f84467e19f
am:
7ee513c27b
Change-Id: Iafbf2f2ca92b288de7bded40772cd15eca2012ee
Felipe Leme [Thu, 27 Apr 2017 05:11:38 +0000 (05:11 +0000)]
Merge "Autofill binding permission fixes." into oc-dev
am:
d915c42150
Change-Id: I355fe15bed198f2db1bd819bbeb138be9bea56d2
Peng Xu [Thu, 27 Apr 2017 05:09:46 +0000 (05:09 +0000)]
Merge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev am:
3ab258c98d
am:
5d34ce7f65
Change-Id: If08c2b50114940ff75795f4c15b005ece7958b6b
Julia Reynolds [Thu, 27 Apr 2017 05:04:18 +0000 (05:04 +0000)]
Merge "Api updates" into oc-dev
am:
f84467e19f
Change-Id: I136a7713ee8f2b625b58aac29f5315c5b336256b
David Lin [Thu, 27 Apr 2017 05:01:30 +0000 (05:01 +0000)]
Merge "Fix volume key events are dispatched when screen is off" into oc-dev am:
0db47f9364
am:
5bcb6e02e5
Change-Id: Idd21475441d4a97247ab651df13fa84bb93a3d7a
Peng Xu [Thu, 27 Apr 2017 05:00:12 +0000 (05:00 +0000)]
Merge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev
am:
3ab258c98d
Change-Id: I2c36bf36a085f9c4535d74dc3245abfe56a2b322
Joe Fernandez [Thu, 27 Apr 2017 04:59:16 +0000 (04:59 +0000)]
Merge "docs: Update ScrollView JavaDoc comments" into oc-dev am:
47ca22e361
am:
41043c27a7
Change-Id: Ie7ffd3ffd9e3c9e9a2f5d85a5a6c465ebf61d76a
TreeHugger Robot [Thu, 27 Apr 2017 04:56:39 +0000 (04:56 +0000)]
Merge "Autofill binding permission fixes." into oc-dev
Joe Fernandez [Thu, 27 Apr 2017 04:53:44 +0000 (04:53 +0000)]
Merge "docs: Update RelativeLayout.LayoutParams JavaDoc comments" into oc-dev am:
b312d38868
am:
6e76d0dd0a
Change-Id: I6cd2c025531f9bfec8fe811c0c949226ff59fffd
TreeHugger Robot [Thu, 27 Apr 2017 04:51:37 +0000 (04:51 +0000)]
Merge "Api updates" into oc-dev
David Lin [Thu, 27 Apr 2017 04:50:55 +0000 (04:50 +0000)]
Merge "Fix volume key events are dispatched when screen is off" into oc-dev
am:
0db47f9364
Change-Id: I0a7c23f9ad342de17a427c0f22ab683d727a3166
Peng Xu [Thu, 27 Apr 2017 04:49:11 +0000 (04:49 +0000)]
Merge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev
Svet Ganov [Thu, 27 Apr 2017 04:46:53 +0000 (04:46 +0000)]
Merge "Handle package changes in autofill manager service" into oc-dev am:
01d51288df
am:
9bf772566b
Change-Id: I0f18c9754249050c626c9078ed7fd5b705f84e9e
TreeHugger Robot [Thu, 27 Apr 2017 04:46:29 +0000 (04:46 +0000)]
Merge "Fix volume key events are dispatched when screen is off" into oc-dev
Joe Fernandez [Thu, 27 Apr 2017 04:42:27 +0000 (04:42 +0000)]
Merge "docs: Update ScrollView JavaDoc comments" into oc-dev
am:
47ca22e361
Change-Id: I420d715eb686c1a27f888a394d764358cb227df6
Joe Fernandez [Thu, 27 Apr 2017 04:42:18 +0000 (04:42 +0000)]
Merge "docs: Update LinearLayout JavaDoc comments" into oc-dev am:
ca105f6c29
am:
6fcab388e1
Change-Id: I67bf48a579fd81ed3f3756e5077353fdfa2329ed
Joe Fernandez [Thu, 27 Apr 2017 04:40:23 +0000 (04:40 +0000)]
Merge "docs: Update ProgressBar JavaDoc comments" into oc-dev am:
80fe019f6b
am:
140a0c4569
Change-Id: I413a86d8371afff68fbfa1f868643b9c65ea5b98
Joe Fernandez [Thu, 27 Apr 2017 04:40:19 +0000 (04:40 +0000)]
Merge "docs: Update RelativeLayout.LayoutParams JavaDoc comments" into oc-dev
am:
b312d38868
Change-Id: I1452e7e30f5eea7da222b093b0e8d6d1fb400c10
Svet Ganov [Thu, 27 Apr 2017 04:36:08 +0000 (04:36 +0000)]
Merge "Handle package changes in autofill manager service" into oc-dev
am:
01d51288df
Change-Id: Idcc327443e903d7b5b09526babf62426e3b83291
Joe Fernandez [Thu, 27 Apr 2017 04:33:16 +0000 (04:33 +0000)]
Merge "docs: Update LinearLayout JavaDoc comments" into oc-dev
am:
ca105f6c29
Change-Id: I474bae032506243df9035056155fc0738f49e445
Joe Fernandez [Thu, 27 Apr 2017 04:31:10 +0000 (04:31 +0000)]
Merge "docs: Update ProgressBar JavaDoc comments" into oc-dev
am:
80fe019f6b
Change-Id: Ia821d6edb1c0c1b44b7a1f33490c4046d81ff2cc
TreeHugger Robot [Thu, 27 Apr 2017 04:29:09 +0000 (04:29 +0000)]
Merge "docs: Update ScrollView JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:28:31 +0000 (04:28 +0000)]
Merge "docs: Update RelativeLayout.LayoutParams JavaDoc comments" into oc-dev
Fyodor Kupolov [Thu, 27 Apr 2017 04:23:39 +0000 (04:23 +0000)]
Merge "Blame services for slow operations" into oc-dev am:
3acd16b43d
am:
bfe28d654c
Change-Id: Icc6d41a791400355194d0d7ff7a87b915f819f63
TreeHugger Robot [Thu, 27 Apr 2017 04:22:20 +0000 (04:22 +0000)]
Merge "Handle package changes in autofill manager service" into oc-dev
Bartosz Fabianowski [Thu, 27 Apr 2017 04:21:21 +0000 (04:21 +0000)]
Merge "Add device ID attestation method to keymaster" into oc-dev am:
9138c5dfa7
am:
06269a51a3
Change-Id: I0a6189a43f3da80e3e6c70e419bd19e492a3431a
TreeHugger Robot [Thu, 27 Apr 2017 04:21:09 +0000 (04:21 +0000)]
Merge "docs: Update LinearLayout JavaDoc comments" into oc-dev
Fyodor Kupolov [Thu, 27 Apr 2017 04:14:24 +0000 (04:14 +0000)]
Merge "Blame services for slow operations" into oc-dev
am:
3acd16b43d
Change-Id: I17dabe18c63f1743b8b7586f27e4c3a16d7303b0
TreeHugger Robot [Thu, 27 Apr 2017 04:12:44 +0000 (04:12 +0000)]
Merge "docs: Update ProgressBar JavaDoc comments" into oc-dev
Fyodor Kupolov [Thu, 27 Apr 2017 04:10:12 +0000 (04:10 +0000)]
Merge "Call getAllowedUid on a separate thread" into oc-dev am:
21c34e2b50
am:
fdfb7cd6ff
Change-Id: Ife349a67029eb71139e1e6e287edd1cfd59bacd6
Erik Kline [Thu, 27 Apr 2017 04:08:10 +0000 (04:08 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output." into oc-dev am:
40ccb1b5aa
am:
b8392e6105
Change-Id: Iec4ab9cadefb9de773e73a124d40ac5f69b8136d
Bartosz Fabianowski [Thu, 27 Apr 2017 04:04:45 +0000 (04:04 +0000)]
Merge "Add device ID attestation method to keymaster" into oc-dev
am:
9138c5dfa7
Change-Id: I27c7bd606df0c584d897523c787ae684e9c0c30c
Fyodor Kupolov [Thu, 27 Apr 2017 04:00:09 +0000 (04:00 +0000)]
Merge "Call getAllowedUid on a separate thread" into oc-dev
am:
21c34e2b50
Change-Id: I7df45a4b0124b68e049bd0b80f7ab6cef2cda4d1
TreeHugger Robot [Thu, 27 Apr 2017 03:59:53 +0000 (03:59 +0000)]
Merge "Blame services for slow operations" into oc-dev
Erik Kline [Thu, 27 Apr 2017 03:58:12 +0000 (03:58 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output." into oc-dev
am:
40ccb1b5aa
Change-Id: Ie883f62bdc731c8da3b3d5ac1df827e1fd5b44be
TreeHugger Robot [Thu, 27 Apr 2017 03:51:29 +0000 (03:51 +0000)]
Merge "Add device ID attestation method to keymaster" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:50:47 +0000 (03:50 +0000)]
Merge "Call getAllowedUid on a separate thread" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:45:50 +0000 (03:45 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output." into oc-dev
Thierry Strudel [Thu, 27 Apr 2017 03:28:07 +0000 (03:28 +0000)]
Merge "Update UsbService to V1_1 usb hal"
Svetoslav Ganov [Thu, 27 Apr 2017 03:12:20 +0000 (03:12 +0000)]
Merge "Drop uses-feature requirement for system process" into oc-dev am:
8ba6fdb3fa
am:
fd991c424b
Change-Id: I5c88fc5bb941ede9d30853b182a7bd5bf58a8f84
Svetoslav Ganov [Thu, 27 Apr 2017 03:06:14 +0000 (03:06 +0000)]
Merge "Drop uses-feature requirement for system process" into oc-dev
am:
8ba6fdb3fa
Change-Id: Ic306e331e0eac1d8559cea71a56211eaadbf35e1
Svetoslav Ganov [Thu, 27 Apr 2017 03:01:55 +0000 (03:01 +0000)]
Merge "Drop uses-feature requirement for system process" into oc-dev
songjinshi [Wed, 15 Mar 2017 08:16:05 +0000 (16:16 +0800)]
[Stability]: fix system_server crash issue caused by fd leak.
If an app incorrect use of registerListener, it will cause
system_server socket fd leak, for example:
protected void onResume() {
super.onResume();
mSensorManager.registerListener(new MySensorEventListener(),
mSensor, SensorManager.SENSOR_DELAY_UI);
Each time a new SensorEventQueue, then in the system_server
will open a new socket fd, as time increases system_server's
fd will be more than 1024 and crash, so we needed add count limit
for sensor listener to improve the system stability.
Test: use the apk attached in the issue
https://code.google.com/p/android/issues/detail?id=258634
Bug:
37543280
Change-Id: I35006966a1638c25bb0f54611e117e16a764e12b
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Svet Ganov [Thu, 27 Apr 2017 01:49:30 +0000 (18:49 -0700)]
Handle package changes in autofill manager service
Autofill manager service was not observing package changes thus
we did not properly handle the cases of the service being updated,
added, and removed. Handling, additions is needed to properly
support restore from a backup. Fixed a few missing locks.
Test: all autofill CTS tests pass and manually tested update, add,
and remove of autofill services.
bug:
36638606
bug:
36978445
Change-Id: Idd47891774ba2a4e562a1952cbb5a048211fd4e3
Kevin Chyn [Wed, 26 Apr 2017 23:15:24 +0000 (16:15 -0700)]
Add setting to enable ES while sleeping
Also changed code so that our contentObserver updates relevant ES
variables when settings are changed
Fixes:
37719853
Test: manual
Change-Id: I624fd5e6cec728ccb01d01b6a8779764aa418a6a
Daniel Sandler [Thu, 27 Apr 2017 01:38:07 +0000 (01:38 +0000)]
Merge "Avoid ClassCastException in ArrayMap." into oc-dev am:
f9e5395081
am:
c467559093
Change-Id: I078ba5b3ce2acaab5151e37f0a0f718f15a230dd
Daniel Sandler [Thu, 27 Apr 2017 01:31:40 +0000 (01:31 +0000)]
Merge "Avoid ClassCastException in ArrayMap." into oc-dev
am:
f9e5395081
Change-Id: I2b8b50865bd6db37092ac5752bf280a74e840074
Daniel Sandler [Thu, 27 Apr 2017 01:23:52 +0000 (01:23 +0000)]
Merge "Avoid ClassCastException in ArrayMap." into oc-dev
Andrii Kulian [Thu, 27 Apr 2017 01:17:51 +0000 (01:17 +0000)]
Merge "Check only task's override config for adjusting bounds" into oc-dev am:
1ad18abedb
am:
bbd883eb88
Change-Id: I4e21b2778465c59e805b32a284323904f5462d98
Christopher Tate [Thu, 27 Apr 2017 01:15:42 +0000 (01:15 +0000)]
Merge "Temporary tracking of JobStatus unprepare" into oc-dev am:
ddd55793bc
am:
71eaea2c76
Change-Id: I4872cb46070d48e355c11044e744378e553e55d2
Andrii Kulian [Thu, 27 Apr 2017 01:06:51 +0000 (01:06 +0000)]
Merge "Check only task's override config for adjusting bounds" into oc-dev
am:
1ad18abedb
Change-Id: I59cc12ece55b02a30dbd9f5f6ae741632dbbbccc
Winson Chung [Thu, 27 Apr 2017 01:04:23 +0000 (01:04 +0000)]
Fixing issue with lingering dismiss PiP overlay. am:
b54b65b001
am:
45cc6e8ce0
Change-Id: I3af3e84db2fd140dfd97413bb29a705a3545ed52
Christopher Tate [Thu, 27 Apr 2017 01:03:48 +0000 (01:03 +0000)]
Merge "Temporary tracking of JobStatus unprepare" into oc-dev
am:
ddd55793bc
Change-Id: I612beb12fa9ca39f6fb0c745dec8439e3581953a
Winson Chung [Thu, 27 Apr 2017 01:03:23 +0000 (01:03 +0000)]
Fix issue with dismiss scrim not spanning full screen am:
ef16fa9842
am:
880433d5ea
Change-Id: I61c728fca79c968111b1ecd5503a71e7b912d181
Winson Chung [Thu, 27 Apr 2017 01:02:13 +0000 (01:02 +0000)]
Prevent IME adjustment for stacks not affected by docked stack resizing am:
fef058d7d0
am:
98822bfdbb
Change-Id: I574b706b4b7dc53bbc7a1138b381e1d5e8b5a7be
Winson Chung [Thu, 27 Apr 2017 01:01:18 +0000 (01:01 +0000)]
Updating PiP API and documentation. am:
709904f800
am:
1aef4da275
Change-Id: Id65ec5a93ef0eccbf4c06a7e3886e08f4d2ca913
Felipe Leme [Thu, 27 Apr 2017 00:42:38 +0000 (17:42 -0700)]
Autofill binding permission fixes.
- Removed deprecated BIND_AUTO_FILL
- Renamed BIND_AUTOFILL to BIND_AUTOFILL_SERVICE
- Kept BIND_AUTOFILL as @hide
- Fixed the permission code
The permission check was actually ignored; it was probably broken when we
introduced support to settings.
Fixes:
37723410
Bug:
37563972
Test: manual verification with existing client
Test: CtsAutoFillServiceTestCases pass
Change-Id: If3abdcb0ae850f0a327bfdbb9ca6c44a24823047
Philip Cuadra [Thu, 27 Apr 2017 00:51:22 +0000 (00:51 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE" am:
ebc94ecac9 am:
dedc04978e am:
a63131321e -s ours
am:
bd555b4549 -s ours
Change-Id: Ibff30d8d85c51bfc50325227b28a6a3b4373af60
Winson Chung [Thu, 27 Apr 2017 00:49:33 +0000 (00:49 +0000)]
Fixing issue with lingering dismiss PiP overlay.
am:
b54b65b001
Change-Id: Iedc5f922b8e4db9cec6fc9f2b28e59846682df2c
Winson Chung [Thu, 27 Apr 2017 00:48:42 +0000 (00:48 +0000)]
Fix issue with dismiss scrim not spanning full screen
am:
ef16fa9842
Change-Id: I3514eb5bf1a7fe42f55dce5bc84b35d433272096
Winson Chung [Thu, 27 Apr 2017 00:47:30 +0000 (00:47 +0000)]
Prevent IME adjustment for stacks not affected by docked stack resizing
am:
fef058d7d0
Change-Id: I18ce84aa67b20b0fbbc44279c89edff107b9d7be
Erik Kline [Thu, 27 Apr 2017 00:46:41 +0000 (00:46 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output." am:
ce94c07ffd am:
3cc7ccfc69 am:
b1914ebb50
am:
211bd49c9d
Change-Id: I7ff76ff8602477586d2fd315c730203f28744027
Winson Chung [Thu, 27 Apr 2017 00:46:25 +0000 (00:46 +0000)]
Updating PiP API and documentation.
am:
709904f800
Change-Id: I28e4de6ab2072c53cc5d7da77b7d70acb63d8ef0
Andrii Kulian [Thu, 27 Apr 2017 00:46:05 +0000 (00:46 +0000)]
Merge "Check only task's override config for adjusting bounds" into oc-dev
Philip Cuadra [Thu, 27 Apr 2017 00:39:46 +0000 (00:39 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE" am:
ebc94ecac9 am:
dedc04978e
am:
a63131321e -s ours
Change-Id: I0eddaabb2aee9e521389905882b42d2cd362e64e
Erik Kline [Thu, 27 Apr 2017 00:35:25 +0000 (00:35 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output." am:
ce94c07ffd am:
3cc7ccfc69
am:
b1914ebb50
Change-Id: If64f2b8a5cdf8b946a82a0c97a42cf61ef5e0b08
TreeHugger Robot [Thu, 27 Apr 2017 00:33:16 +0000 (00:33 +0000)]
Merge "Temporary tracking of JobStatus unprepare" into oc-dev
Philip Cuadra [Thu, 27 Apr 2017 00:26:39 +0000 (00:26 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE" am:
ebc94ecac9
am:
dedc04978e
Change-Id: I5fa80631fe566771525a94c54d8cbbe543b783e0
Erik Kline [Thu, 27 Apr 2017 00:23:55 +0000 (00:23 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output." am:
ce94c07ffd
am:
3cc7ccfc69
Change-Id: I85ba7fe2da509c4581a27400170a537accd844ee
Winson Chung [Wed, 26 Apr 2017 21:02:13 +0000 (14:02 -0700)]
Fixing issue with lingering dismiss PiP overlay.
- Always try and remove the dismiss overlay when animating touch ends, or
if the input consumer is unregistered to handle cases where the
interaction is interrupted by the pip animation.
Bug:
37309693
Test: Intermittent, enter pip and try to tap and then tap-drag the PIP
Change-Id: I05f360f1d9d264590725e13eb2cc9254a3f21eef
Winson Chung [Wed, 26 Apr 2017 15:46:24 +0000 (08:46 -0700)]
Fix issue with dismiss scrim not spanning full screen
Bug:
37309741
Test: Launch PIP activity, go to landscape, drag and ensure dismiss
overlay spans fullscreen
Change-Id: I449c9f2bdaf01357ebdb652665e884c1ada5ea46
Winson Chung [Tue, 25 Apr 2017 21:43:10 +0000 (14:43 -0700)]
Prevent IME adjustment for stacks not affected by docked stack resizing
Bug:
37358175
Test: Resize docked stack while PIP is up
Change-Id: I4f057f6671e8c164624359bf3532f9a22fdf768e
Felipe Leme [Thu, 27 Apr 2017 00:18:21 +0000 (00:18 +0000)]
Merge "Provide support for optimized ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev am:
62bb027d12
am:
889bdc8dc9
Change-Id: Icc27cc9f47339845ebeed647116c914db1cca162
Philip Cuadra [Thu, 27 Apr 2017 00:17:06 +0000 (00:17 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE"
am:
ebc94ecac9
Change-Id: Ibf14ca3ac79d2e522584ad80dc5bf3ffc32c48bc
Erik Kline [Thu, 27 Apr 2017 00:14:50 +0000 (00:14 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output."
am:
ce94c07ffd
Change-Id: If5e0628c3e8ec5c918fe29fea25c24d0fae53614
Winson Chung [Tue, 25 Apr 2017 18:00:48 +0000 (11:00 -0700)]
Updating PiP API and documentation.
- Renaming PictureInPictureArgs to PictureInPictureParams, making it
immutable and built with a builder class. In addition, making the
aspect ratio rational.
- Moving the check to get max number of actions to the activity to have
more flexibility going forward
- Also ensures that enterPictureInPictureMode() returns true if the
activity is already in PiP mode.
- Will follow up with CL to remove PictureInPictureArgs and related methods
once this CL drops
Bug:
35765211
Bug:
37638323
Bug:
37637423
Bug:
37636674
Bug:
36342780
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: android.app.cts.PictureInPictureParamsBuilderTest
Change-Id: I54a487d55a59c9ce8ac7bd6c80c61209c8b26224
Signed-off-by: Winson Chung <winsonc@google.com>
OSDN Git Service
