OSDN Git Service
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
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
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
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"
TreeHugger Robot [Thu, 27 Apr 2017 05:21:17 +0000 (05:21 +0000)]
Merge "docs: Update Button JavaDoc comments" into oc-dev
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
Julia Reynolds [Thu, 27 Apr 2017 05:04:18 +0000 (05:04 +0000)]
Merge "Api updates" into oc-dev
am:
f84467e19f
Change-Id: I136a7713ee8f2b625b58aac29f5315c5b336256b
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
TreeHugger Robot [Thu, 27 Apr 2017 04:56:39 +0000 (04:56 +0000)]
Merge "Autofill binding permission fixes." into oc-dev
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
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: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
TreeHugger Robot [Thu, 27 Apr 2017 04:22:20 +0000 (04:22 +0000)]
Merge "Handle package changes in autofill manager service" into oc-dev
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
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
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
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:06:51 +0000 (01:06 +0000)]
Merge "Check only task's override config for adjusting bounds" into oc-dev
am:
1ad18abedb
Change-Id: I59cc12ece55b02a30dbd9f5f6ae741632dbbbccc
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
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
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
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
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>
Treehugger Robot [Thu, 27 Apr 2017 00:01:53 +0000 (00:01 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE"
Erik Kline [Wed, 26 Apr 2017 23:56:58 +0000 (23:56 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output."
Felipe Leme [Wed, 26 Apr 2017 23:54:31 +0000 (23:54 +0000)]
Merge "Provide support for optimized ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
am:
62bb027d12
Change-Id: If9e223a9cc7585568eb86995f0d0ef458d2c658c
Makoto Onuki [Wed, 26 Apr 2017 23:49:58 +0000 (23:49 +0000)]
Merge "Enhance DeviceAdminService javadoc and remove TODO." into oc-dev
am:
397335d926
Change-Id: Ie69d82114c5df99261c3d9fcfe2dd47eb6d7ddf1
Bill Yi [Wed, 26 Apr 2017 23:48:06 +0000 (23:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
73614be4c5 -s ours
Change-Id: I4e19041610a272a262a80f5f67310db3a7005280
Felipe Leme [Wed, 26 Apr 2017 23:46:16 +0000 (23:46 +0000)]
Merge "Provide support for optimized ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
Bill Yi [Wed, 26 Apr 2017 23:46:03 +0000 (23:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
62b2950374 -s ours
Change-Id: I795b221dea9ea31efc9e96edaf4598384e75c9ee
Bill Yi [Wed, 26 Apr 2017 23:42:29 +0000 (23:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
16e7c7f0df -s ours
Change-Id: I6fb1b99241d1a43296812bb324127540184e42da
Makoto Onuki [Wed, 26 Apr 2017 23:33:56 +0000 (23:33 +0000)]
Merge "Enhance DeviceAdminService javadoc and remove TODO." into oc-dev
Seigo Nonaka [Wed, 26 Apr 2017 23:32:57 +0000 (23:32 +0000)]
Merge "Font API clean up" into oc-dev
am:
25c2cdc052
Change-Id: Ica94609836262103b721138eaac413c8192a7ca7
Makoto Onuki [Wed, 26 Apr 2017 23:29:27 +0000 (23:29 +0000)]
Merge "Only show progress log every 10%" into oc-dev
am:
b4e05340e4
Change-Id: Iae1786f56313537acddd5b7ad5aaa1ae9510a5da
TreeHugger Robot [Wed, 26 Apr 2017 23:26:43 +0000 (23:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Apr 2017 23:25:49 +0000 (23:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Apr 2017 23:24:27 +0000 (23:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Seigo Nonaka [Wed, 26 Apr 2017 23:19:51 +0000 (23:19 +0000)]
Merge "Font API clean up" into oc-dev
Makoto Onuki [Wed, 26 Apr 2017 23:18:43 +0000 (23:18 +0000)]
Merge "Only show progress log every 10%" into oc-dev
Christopher Tate [Wed, 26 Apr 2017 22:41:37 +0000 (15:41 -0700)]
Temporary tracking of JobStatus unprepare
For help diagnosing bug
37209909
Test: manual
Change-Id: If93ee0d25f462d5c8e954d3d7cbdc280b5d18c7e
Suprabh Shukla [Wed, 26 Apr 2017 22:25:44 +0000 (22:25 +0000)]
Merge "Fix the notification issue shown on startForeground" am:
ea86140ba4 am:
3b498d1c56
am:
fd0239aa3f
Change-Id: I6af10951b51d739a1e0500cefe5d1d07f7742c27
Suprabh Shukla [Wed, 26 Apr 2017 22:11:17 +0000 (22:11 +0000)]
Merge "Fix the notification issue shown on startForeground" am:
ea86140ba4
am:
3b498d1c56
Change-Id: Ibd6d57617c6d7d8ad2bffebb6f72337e7d11e9af
Suprabh Shukla [Wed, 26 Apr 2017 22:05:07 +0000 (22:05 +0000)]
Merge "Fix the notification issue shown on startForeground"
am:
ea86140ba4
Change-Id: Ic95c9c78b05c4f4920c04a654296d2a6e4283eea
Conrad Chen [Wed, 26 Apr 2017 22:00:13 +0000 (22:00 +0000)]
Merge "TIF: fix javadoc of recorded programs" into oc-dev
am:
a16d465a18
Change-Id: Ica4cee335dcba58f16ac7b1ebd5f96e7211554db
Rob Carr [Wed, 26 Apr 2017 21:56:55 +0000 (21:56 +0000)]
Merge "More targeted version of "Correct animation glitch for pinned stack."" into oc-dev
am:
d00cb1c48a
Change-Id: I0b91b0d0645a43185a128f1b94ee1ea8eba2c621
Suprabh Shukla [Wed, 26 Apr 2017 21:56:23 +0000 (21:56 +0000)]
Merge "Fix the notification issue shown on startForeground"
Rob Carr [Wed, 26 Apr 2017 21:54:48 +0000 (21:54 +0000)]
Merge "Fix logspam NPE." into oc-dev
am:
bd1ef76684
Change-Id: I16bfcd16236ba42302208dce37e3eb08907f2c91
Conrad Chen [Wed, 26 Apr 2017 21:47:55 +0000 (21:47 +0000)]
Merge "TIF: fix javadoc of recorded programs" into oc-dev
Philip Cuadra [Wed, 26 Apr 2017 20:49:37 +0000 (13:49 -0700)]
Allow Bluetooth CAP_SYS_NICE
Bluetooth needs CAP_SYS_NICE in order to make important threads use RT
scheduling policy.
Bug
37518404
Test: Play Bluetooth audio, confirm RT priority in systrace
Change-Id: I388ef78d1aaf3f5fe1aa901b48d76c5c992acacc
Merged-In: I0ee55a2f2cfd80cbb066d9c034bb85d8d85ba470
Rob Carr [Wed, 26 Apr 2017 21:43:51 +0000 (21:43 +0000)]
Merge "More targeted version of "Correct animation glitch for pinned stack."" into oc-dev
Rob Carr [Wed, 26 Apr 2017 21:43:25 +0000 (21:43 +0000)]
Merge "Fix logspam NPE." into oc-dev
Michal Karpinski [Wed, 26 Apr 2017 21:41:04 +0000 (21:41 +0000)]
Merge "Fix BackupSettingsTest (update blacklists)" into oc-dev
am:
1c2964bdeb
Change-Id: Ia07281b2e9c67250e4f9d927d2a0e3ea3460bac9
TreeHugger Robot [Wed, 26 Apr 2017 21:28:23 +0000 (21:28 +0000)]
Merge "Fix BackupSettingsTest (update blacklists)" into oc-dev
Rebecca Silberstein [Wed, 26 Apr 2017 21:23:20 +0000 (21:23 +0000)]
Merge "Merge "WifiManager: add updateInterfaceIpState" am:
2dbd137795 am:
6f69ea87e7" into nyc-mr2-dev-plus-aosp
am:
2270951bb9
Change-Id: Iabd864759181aba72766a26110ecef9f4cca3d5d
Android Build Merger (Role) [Wed, 26 Apr 2017 21:19:43 +0000 (21:19 +0000)]
Merge "Merge "DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am:
31add96517 am:
a701205315 -s ours" into oc-dev am:
9e3c12e173" into oc-dev-plus-aosp
Julius D'souza [Wed, 26 Apr 2017 21:18:54 +0000 (21:18 +0000)]
Merge "DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am:
31add96517 am:
a701205315 -s ours" into oc-dev
am:
9e3c12e173
Change-Id: I4b5a02f21a394aaa5ec73c88070fdb853b49d68c
Android Build Merger (Role) [Wed, 26 Apr 2017 21:18:21 +0000 (21:18 +0000)]
Merge "Merge "Use uptimeMillis instead of currentTimeMillis for interval calculation." into oc-dev am:
776f480c49" into oc-dev-plus-aosp
Alison Cichowlas [Wed, 26 Apr 2017 21:17:36 +0000 (21:17 +0000)]
Merge "Use uptimeMillis instead of currentTimeMillis for interval calculation." into oc-dev
am:
776f480c49
Change-Id: I76c22e43e91ae3d92aceaf197ce2860cb0a744d0
Android Build Merger (Role) [Wed, 26 Apr 2017 21:17:12 +0000 (21:17 +0000)]
Merge "DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am:
31add96517 am:
a701205315 -s ours am:
4334664267" into oc-dev-plus-aosp
Julius D'souza [Wed, 26 Apr 2017 21:16:26 +0000 (21:16 +0000)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am:
31add96517 am:
a701205315 -s ours
am:
4334664267
Change-Id: I3fc1f7def63e6814a13ad8654280831b7b2e4b29
Android Build Merger (Role) [Wed, 26 Apr 2017 21:14:17 +0000 (21:14 +0000)]
Merge "Merge "WifiManager: add updateInterfaceIpState" am:
2dbd137795 am:
6f69ea87e7" into nyc-mr2-dev-plus-aosp
Rebecca Silberstein [Wed, 26 Apr 2017 21:13:34 +0000 (21:13 +0000)]
Merge "WifiManager: add updateInterfaceIpState" am:
2dbd137795 am:
6f69ea87e7
am:
c58e6e4a7f
Change-Id: I9f9d579f782d3523dd71de9f49231ca6c8a305da
OSDN Git Service
