OSDN Git Service
Abodunrinwa Toki [Thu, 4 May 2017 15:24:23 +0000 (15:24 +0000)]
Merge "Only classify text when the toolbar is shown." into oc-dev
am:
a20b6ba1f2
Change-Id: I94619c59f052a170c3b40d8de25a5c6f7a71fa85
TreeHugger Robot [Thu, 4 May 2017 15:15:30 +0000 (15:15 +0000)]
Merge "Only classify text when the toolbar is shown." into oc-dev
Neil Fuller [Thu, 4 May 2017 15:12:18 +0000 (15:12 +0000)]
Merge "Time zone update API classes" into oc-dev-plus-aosp
Neil Fuller [Thu, 4 May 2017 14:59:58 +0000 (14:59 +0000)]
Merge "More time zone update API classes" am:
c301339498 am:
9798dc47b1
am:
2cf4771469
Change-Id: Ic82572f406fd56dd11afce108e14ff0dcb45557e
Neil Fuller [Thu, 16 Mar 2017 18:29:36 +0000 (18:29 +0000)]
Time zone update API classes
Time zone update API classes. Currently hidden but they
will go on to be unhidden in future.
This forms the basis of client and system server code to
support time zone updates.
Tests can be run with:
make -j30 FrameworksCoreTests
adb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
adb shell am instrument -e package android.app.timezone \
-w com.android.frameworks.coretests \
"com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"
This contains a cherry-pick / conflict resolution of
commit
bede17c216815a849be0c43d5ce7daaf750a9fac after an automerger skip.
(cherry picked from commit
bede17c216815a849be0c43d5ce7daaf750a9fac)
Bug:
31008728
Test: See above.
Merged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833
Change-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1
Neil Fuller [Thu, 4 May 2017 14:53:53 +0000 (14:53 +0000)]
Merge "More time zone update API classes" am:
c301339498
am:
9798dc47b1
Change-Id: Ia85f1ec883b8ac8cb9a93dfbfabacd1589aafe8f
Neil Fuller [Thu, 4 May 2017 14:48:21 +0000 (14:48 +0000)]
Merge "More time zone update API classes"
am:
c301339498
Change-Id: I23ace2d5102f197ca6d6e22a37b54b43e38753ed
Treehugger Robot [Thu, 4 May 2017 14:41:08 +0000 (14:41 +0000)]
Merge "More time zone update API classes"
Neil Fuller [Thu, 4 May 2017 14:29:30 +0000 (14:29 +0000)]
Merge "Merge "Time zone update API classes" am:
cfe0c2f1ec am:
463f3f8cf7" into nyc-mr2-dev-plus-aosp
am:
5b14a2f0b5
Change-Id: I614964f97c141532560932955fecb5bcd61eb075
Neil Fuller [Thu, 4 May 2017 14:27:28 +0000 (14:27 +0000)]
Merge "Time zone update API classes" am:
cfe0c2f1ec am:
463f3f8cf7
am:
3620392aca -s ours
Change-Id: I2e7c0837ec5f5bc0f93c695ef7cc812305aa6d5c
Android Build Merger (Role) [Thu, 4 May 2017 14:19:36 +0000 (14:19 +0000)]
Merge "Merge "Time zone update API classes" am:
cfe0c2f1ec am:
463f3f8cf7" into nyc-mr2-dev-plus-aosp
Neil Fuller [Thu, 4 May 2017 14:18:53 +0000 (14:18 +0000)]
Merge "Time zone update API classes" am:
cfe0c2f1ec
am:
463f3f8cf7
Change-Id: I633e734b90cb2f4fb12590a15d2fdc634faf7a9c
Geoffrey Pitsch [Thu, 4 May 2017 14:15:51 +0000 (14:15 +0000)]
Merge "Developer setting to show toast for notifications without a channel" into oc-dev
am:
3c0e3d8a36
Change-Id: Ib5f7130e2940365b3868f735fe2f9881a54f0e71
TreeHugger Robot [Thu, 4 May 2017 14:08:58 +0000 (14:08 +0000)]
Merge "Developer setting to show toast for notifications without a channel" into oc-dev
Neil Fuller [Thu, 4 May 2017 14:06:56 +0000 (14:06 +0000)]
Merge "Time zone update API classes" am:
cfe0c2f1ec
am:
463f3f8cf7
Change-Id: I519483f82e12a038e52f3b4813b0db0325749925
Neil Fuller [Thu, 4 May 2017 14:01:23 +0000 (14:01 +0000)]
Merge "Time zone update API classes"
am:
cfe0c2f1ec
Change-Id: I6442aee1844ec9c6ef1017a4744936252ef45243
Neil Fuller [Thu, 4 May 2017 13:51:38 +0000 (13:51 +0000)]
Merge "Time zone update API classes"
Todd Kennedy [Thu, 4 May 2017 13:30:45 +0000 (13:30 +0000)]
Merge "ignore exception calling unlinkToDeath" into oc-dev
am:
79777a5b43
Change-Id: Iaffd850d9422244d92340ac8c5c2346cbb58f39f
TreeHugger Robot [Thu, 4 May 2017 13:23:46 +0000 (13:23 +0000)]
Merge "ignore exception calling unlinkToDeath" into oc-dev
Neil Fuller [Thu, 16 Mar 2017 18:31:56 +0000 (18:31 +0000)]
More time zone update API classes
This class forms the contract between the updater app
(the app provided by and triggered by the system)
and the data app (the app provided by the OEM to
provide time zone data).
Bug:
31008728
Test: make only, just constants
Change-Id: I687b75954e132884aec962fcf8955f3f38a00b2f
Abodunrinwa Toki [Wed, 3 May 2017 19:22:55 +0000 (20:22 +0100)]
Only classify text when the toolbar is shown.
classifyText() is used to generate a menu item in the selection toolbar
to handle the selected text. In this cl we avoid calling classifyText()
when the selection is changing but instead call it when we are about to
show the toolbar.
Previously, we depended on invalidateActionModeAsync() to classify text
after a call to startActionMode(). Now that we've introduced
invalidateActionMode() we need to be able to tell
startSelectionActionMode() that we also want the text to be classified,
hence the introduction of an input parameter, "adjustSelection", to
startSelectionActionModeAysnc().
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Bug:
34966796
Change-Id: I5b9fc9e8ab443f024f8ca461df5a4bcc6485d26b
Android Build Merger (Role) [Thu, 4 May 2017 12:00:06 +0000 (12:00 +0000)]
Merge "Merge "Adjust forced dexopt in case of stripped APKs." am:
5669550a83 am:
f59dd816b1 am:
8d76994c5b" into oc-dev-plus-aosp
Nicolas Geoffray [Thu, 4 May 2017 11:59:12 +0000 (11:59 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs." am:
5669550a83 am:
f59dd816b1
am:
8d76994c5b
Change-Id: I11871e75179ec64bd30fe23d6bcb40765ce6c64b
Nicolas Geoffray [Thu, 4 May 2017 11:53:58 +0000 (11:53 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs." am:
5669550a83 am:
f59dd816b1
am:
8d76994c5b
Change-Id: I87acb3200de0e731eab78107d30c3c8999674c6d
Android Build Merger (Role) [Thu, 4 May 2017 11:46:16 +0000 (11:46 +0000)]
Merge "Merge "Handle volume keys to apps in Vr mode" into oc-dev am:
a58589bdc1" into oc-dev-plus-aosp
Nicolas Geoffray [Thu, 4 May 2017 11:42:13 +0000 (11:42 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs." am:
5669550a83
am:
f59dd816b1
Change-Id: If41af16abab0e193fcfef6a939f039a4f24a38ef
Karthik Ravi Shankar [Thu, 4 May 2017 11:42:03 +0000 (11:42 +0000)]
Merge "Handle volume keys to apps in Vr mode" into oc-dev
am:
a58589bdc1
Change-Id: Ib4ef4f2e70fe86970c7d1224466dc75cc8883f7f
Karthik Ravi Shankar [Thu, 4 May 2017 11:38:26 +0000 (11:38 +0000)]
Merge "Handle volume keys to apps in Vr mode" into oc-dev
am:
a58589bdc1
Change-Id: I05992bb4a0f3ac1343bf55a9c33297542ff45424
Nicolas Geoffray [Thu, 4 May 2017 11:34:06 +0000 (11:34 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs."
am:
5669550a83
Change-Id: I1ca14c8eee35cb3f793b2a004f5bd6f6b8ca6120
Neil Fuller [Thu, 16 Mar 2017 18:29:36 +0000 (18:29 +0000)]
Time zone update API classes
Time zone update API classes. Currently hidden but they
will go on to be unhidden in future.
This forms the basis of client and system server code to
support time zone updates.
Tests can be run with:
make -j30 FrameworksCoreTests
adb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
adb shell am instrument -e package android.app.timezone \
-w com.android.frameworks.coretests \
"com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"
Bug:
31008728
Test: See above.
Merged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833
Change-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1
TreeHugger Robot [Thu, 4 May 2017 11:26:53 +0000 (11:26 +0000)]
Merge "Handle volume keys to apps in Vr mode" into oc-dev
Nicolas Geoffray [Thu, 4 May 2017 11:25:03 +0000 (11:25 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs."
Nicolas Geoffray [Wed, 3 May 2017 10:51:53 +0000 (11:51 +0100)]
Adjust forced dexopt in case of stripped APKs.
We cannot compile from scratch for strip APK. So
if getDexOptNeeded returns NotNeeded, pretend there was
a compiler filter change, in order to pick up the vdex file.
bug:
37558732
Test: "adb shell cmd package compile" of a stripped /system apk
Change-Id: I531010e01e44adfa300872c1739c49dab7292317
Tony Mak [Thu, 4 May 2017 08:50:01 +0000 (08:50 +0000)]
Merge "selectBackupTransportAsync should report failure when backup is not available" into oc-dev
am:
9dee975361
Change-Id: I174fa48341337fa38e1edf40460f01a655fff62a
TreeHugger Robot [Thu, 4 May 2017 08:43:59 +0000 (08:43 +0000)]
Merge "selectBackupTransportAsync should report failure when backup is not available" into oc-dev
Matthew Ng [Thu, 4 May 2017 06:40:45 +0000 (06:40 +0000)]
Merge "Reset touch location after touch slop is exceeded in recents" into oc-dev
am:
02862f31f8
Change-Id: Ided4114855fa866fca637f8171ea7030e347f485
TreeHugger Robot [Thu, 4 May 2017 06:35:48 +0000 (06:35 +0000)]
Merge "Reset touch location after touch slop is exceeded in recents" into oc-dev
Christopher Tate [Thu, 4 May 2017 06:32:49 +0000 (06:32 +0000)]
Merge "Allow TIMEZONE_CHANGED to launch apps" into oc-dev
am:
b84b8bd40d
Change-Id: I7fe49ac402da96a8279212ba3e35442c26075cbd
TreeHugger Robot [Thu, 4 May 2017 06:27:29 +0000 (06:27 +0000)]
Merge "Allow TIMEZONE_CHANGED to launch apps" into oc-dev
Karthik Ravi Shankar [Thu, 4 May 2017 05:23:42 +0000 (05:23 +0000)]
Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev
am:
1d01f9cf67
Change-Id: I4072d3d1ccd258473ccc35412dd3b002e0239f2d
Karthik Ravi Shankar [Thu, 4 May 2017 05:17:13 +0000 (05:17 +0000)]
Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev
Karthik Ravi Shankar [Mon, 1 May 2017 08:34:19 +0000 (01:34 -0700)]
Rename CompatibilityDisplay to Vr2dDisplay
CompatibilityDisplay used for displaying 2D activities in Vr world. This
is confusing in more than one way. To clarify what it really means,
rename it to Vr2dDisplay.
Changes in this CL -
- /s/CompatibilityDisplay/Vr2dDisplay
- /s/Compatibility/Vr2d - in CompatibilityDisplay context.
Bug:
37851944
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests
passes on Marlin.
Change-Id: I0a442302fa9d0f48bbd0c01a7766b94369e04386
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
gaoshang [Thu, 4 May 2017 03:57:46 +0000 (03:57 +0000)]
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" am:
36247646e3 am:
0f722b529c
am:
ca8edea785
Change-Id: Ice647d05aff24a317862f54fb52ebccbeddd5e1a
gaoshang [Thu, 4 May 2017 03:51:43 +0000 (03:51 +0000)]
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" am:
36247646e3
am:
0f722b529c
Change-Id: Ic315d3c7d7cfc0132237de29fc7426d412cdb96b
gaoshang [Thu, 4 May 2017 03:46:13 +0000 (03:46 +0000)]
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend"
am:
36247646e3
Change-Id: I245d63d33fdc7376e05539486be3b31b284ea11f
Treehugger Robot [Thu, 4 May 2017 03:37:36 +0000 (03:37 +0000)]
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend"
Android Build Merger (Role) [Thu, 4 May 2017 03:03:49 +0000 (03:03 +0000)]
Merge "Merge "Added TaskSnapshotCacheTest back to presubmit" into oc-dev am:
2ecf42f96c" into oc-dev-plus-aosp
Wale Ogunwale [Thu, 4 May 2017 03:03:10 +0000 (03:03 +0000)]
Merge "Added TaskSnapshotCacheTest back to presubmit" into oc-dev
am:
2ecf42f96c
Change-Id: If89b6af0c20e7a42ce1cd6fe31b042f4d7ffdaad
Wale Ogunwale [Thu, 4 May 2017 03:00:31 +0000 (03:00 +0000)]
Merge "Added TaskSnapshotCacheTest back to presubmit" into oc-dev
am:
2ecf42f96c
Change-Id: Ia90b5875ccf5baea70b6d7ae844cf07b8b9dd67c
TreeHugger Robot [Thu, 4 May 2017 02:51:58 +0000 (02:51 +0000)]
Merge "Added TaskSnapshotCacheTest back to presubmit" into oc-dev
gaoshang [Thu, 20 Apr 2017 06:14:18 +0000 (14:14 +0800)]
fix KeyEvent can't correctly finish when inputmethod time out happend
Symptom: If inputmethod handle an KeyEvent time out ,
Did not finish this event correctly , eventually lead to app ANR
Root Cause: without seq number when obtainMessage MSG_TIMEOUT_INPUT_EVENT
Solution: add seq parameter
Test: Input
Test: InputMethod
Fixes:
37648930
Change-Id: I3a2b964b34aa57267bd777305200a2bfdc66f65c
Merged-In: I3a2b964b34aa57267bd777305200a2bfdc66f65c
Signed-off-by: gaoshang <gaoshang@xiaomi.com>
Felipe Leme [Thu, 4 May 2017 01:55:14 +0000 (01:55 +0000)]
Merge "Always start a manual request, even if view was already autofilled." into oc-dev
am:
5fafafaba2
Change-Id: I52f98e7126a036eb2925660ab36284cfb57801d9
TreeHugger Robot [Thu, 4 May 2017 01:47:00 +0000 (01:47 +0000)]
Merge "Always start a manual request, even if view was already autofilled." into oc-dev
Antony Sargent [Thu, 4 May 2017 01:43:00 +0000 (01:43 +0000)]
Merge "Add persistent state for Bluetooth high quality audio support" into oc-dev
am:
d53a71f443
Change-Id: I735640f2c9c7a00ab206372ffa33f51621546e78
TreeHugger Robot [Thu, 4 May 2017 01:37:02 +0000 (01:37 +0000)]
Merge "Add persistent state for Bluetooth high quality audio support" into oc-dev
Jeff Sharkey [Thu, 4 May 2017 01:11:36 +0000 (01:11 +0000)]
Merge "Revert "Don't add other's child as header or footer"" into oc-dev
am:
6e0332f308
Change-Id: I088c65f866de6a9df51784865531b0cc44ea4248
Christopher Tate [Thu, 4 May 2017 01:10:39 +0000 (18:10 -0700)]
Allow TIMEZONE_CHANGED to launch apps
Bug
37866305
Test: manual
Change-Id: If15df909e99e910c012f2a7b33ae8600c0f97d8d
TreeHugger Robot [Thu, 4 May 2017 01:03:56 +0000 (01:03 +0000)]
Merge "Revert "Don't add other's child as header or footer"" into oc-dev
Calin Juravle [Thu, 4 May 2017 00:41:15 +0000 (00:41 +0000)]
Merge "Fix potential race in DexManager" into oc-dev
am:
c54fa39d8b
Change-Id: I1c7f3138ac6354ccc98d66dfb350bc184e5f1059
Siyamed Sinir [Thu, 4 May 2017 00:37:01 +0000 (00:37 +0000)]
Merge "Don't copy NoCopySpans for assist and autofill" into oc-dev
am:
5073b91236
Change-Id: I3320735cffac4a6802b0a4e64bf0a64e845ac6df
Calin Juravle [Thu, 4 May 2017 00:35:39 +0000 (00:35 +0000)]
Merge "Fix potential race in DexManager" into oc-dev
Sudheer Shanka [Thu, 4 May 2017 00:35:03 +0000 (00:35 +0000)]
Merge "Reduce the timeout for waiting for the network state update." into oc-dev
am:
f345a436be
Change-Id: I62dcd82ec7dc1ef4b3fb9ab2c332f18581b7425d
Siyamed Sinir [Thu, 4 May 2017 00:27:27 +0000 (00:27 +0000)]
Merge "Don't copy NoCopySpans for assist and autofill" into oc-dev
Sudheer Shanka [Thu, 4 May 2017 00:26:52 +0000 (00:26 +0000)]
Merge "Reduce the timeout for waiting for the network state update." into oc-dev
Jorim Jaggi [Thu, 4 May 2017 00:23:24 +0000 (00:23 +0000)]
Merge "Avoid reading HW bitmap pixels twice" into oc-dev
am:
afe23b9b53
Change-Id: If844553df8ef3516880c51dad93edce49146fb70
Ian Pedowitz [Thu, 4 May 2017 00:18:19 +0000 (00:18 +0000)]
Merge "Revert "O is API 26"" into oc-dev
am:
b42b9a22df
Change-Id: Ic869f9f6f627c960222cb5364e04e6f4491c0a88
TreeHugger Robot [Thu, 4 May 2017 00:14:13 +0000 (00:14 +0000)]
Merge "Avoid reading HW bitmap pixels twice" into oc-dev
Matthew Ng [Tue, 2 May 2017 23:47:53 +0000 (16:47 -0700)]
Reset touch location after touch slop is exceeded in recents
There was a jump when a user touch moves over the slop value. To fix
this the location is updated to new y position so that the move
animation of the card after has no visual jump.
Change-Id: Ia9b1d04cc0b2983c2e61114ebbf3bdeb154404e9
Fixes:
35720341
Test: manual - enter recents and slowly drag a card vertically and
notice no jump with the fix, moving after the slop has a consistent
motion
Ian Pedowitz [Thu, 4 May 2017 00:07:05 +0000 (00:07 +0000)]
Merge "Revert "O is API 26"" into oc-dev
Jesse Evans [Thu, 4 May 2017 00:06:55 +0000 (00:06 +0000)]
Merge "Grant ephemeral app access during service bind" into oc-dev
am:
b3af9b7eb7
Change-Id: Id5f5c10b732218d424be259fc1578adbbf9794b7
Sujith Ramakrishnan [Thu, 4 May 2017 00:05:02 +0000 (00:05 +0000)]
Merge "Accessibility shortcut on Android TV." into oc-dev
am:
4fca7821fb
Change-Id: Ib1deb1de528afe648817eb20974e67c35e640786
TreeHugger Robot [Wed, 3 May 2017 23:58:19 +0000 (23:58 +0000)]
Merge "Grant ephemeral app access during service bind" into oc-dev
Sujith Ramakrishnan [Wed, 3 May 2017 23:56:18 +0000 (23:56 +0000)]
Merge "Accessibility shortcut on Android TV." into oc-dev
Hemant Gupta [Wed, 3 May 2017 23:55:12 +0000 (23:55 +0000)]
Bluetooth: OBEX: Don't close transport when obex is disconnected
am:
4dc4d56e5e
Change-Id: If110e06cf8e7fed88fd314e8b7d114121ab76ee1
Todd Kennedy [Wed, 3 May 2017 23:38:44 +0000 (16:38 -0700)]
ignore exception calling unlinkToDeath
Change-Id: If3fdb2ca46f8118d9d2859fc932b4614bb62220e
Fixes:
37893511
Test: Manual
Felipe Leme [Wed, 3 May 2017 23:34:29 +0000 (23:34 +0000)]
Merge "Removed deprecated ViewStructure.setUrl() method." into oc-dev
am:
246cc5bf51
Change-Id: Ie1e1e1edc6fc0b4202379dc61c7bb2167727ba6a
Hemant Gupta [Thu, 5 Nov 2015 08:42:01 +0000 (14:12 +0530)]
Bluetooth: OBEX: Don't close transport when obex is disconnected
Precondition: PTS 7.0
Usecase:
Execute test case TC_TG_CA_BI_02_C for AVRCP 1.6
Expectation:
Test case should pass
Observation:
Test case fails
Root cause:
Disconnection of OBEX from PTS leads to disconnection of transport
(initiated by DUT) leading to test case failure. Obex server was
unnecessary assuming that transport would be disconnected so was
informing registered users that transport has been disconnected,
which was leading to issues on new obex connect on same transport
channel from remote obex client
Fix:
Remove check to break out of loop after obex disconnection, as that is
already handled in case when read would return -1 in case transport
is closed.
Test: TC_TG_CA_BI_02_C can be passed after the patch.
Bug:
35590000
Change-Id: Ic1682ce77c07cf2e43da09dc95fff2214338f758
(cherry picked from commit
850758fb63ded57acf218341812ead95f7159ad6)
TreeHugger Robot [Wed, 3 May 2017 23:16:10 +0000 (23:16 +0000)]
Merge "Removed deprecated ViewStructure.setUrl() method." into oc-dev
Jeremy Joslin [Wed, 3 May 2017 23:05:51 +0000 (23:05 +0000)]
Merge changes from topic 'allow_none_scorer' into oc-dev
am:
d05dda1d40
Change-Id: I90864d95416167384c7acb9ac3d6beb8e523b682
Android Build Merger (Role) [Wed, 3 May 2017 23:03:32 +0000 (23:03 +0000)]
Merge "Merge "Add network disabled reason starting index" into oc-dev am:
c7642c3239" into oc-dev-plus-aosp
Randy Pan [Wed, 3 May 2017 23:01:44 +0000 (23:01 +0000)]
Merge "Add network disabled reason starting index" into oc-dev
am:
c7642c3239
Change-Id: I7b6c39a1e89642e8e8fb7674e26b8323949a79cb
TreeHugger Robot [Wed, 3 May 2017 22:57:07 +0000 (22:57 +0000)]
Merge changes from topic 'allow_none_scorer' into oc-dev
* changes:
Revert permission check on setActiveScorer.
Allow the active scorer to be set to NULL.
Randy Pan [Wed, 3 May 2017 22:55:44 +0000 (22:55 +0000)]
Merge "Add network disabled reason starting index" into oc-dev
Yifan Hong [Wed, 3 May 2017 22:48:32 +0000 (22:48 +0000)]
Merge "Add compatibility matrices to VintfObject.report()" into oc-dev
am:
0e0a37635e
Change-Id: I6e2c660971c296f363b66baa43231e18464ffc34
Chris Craik [Wed, 3 May 2017 22:46:22 +0000 (22:46 +0000)]
Merge "Make all FrameBuilderTests run on RT" into oc-dev
am:
ecc121d8bf
Change-Id: Iee5e75009bfe1dcce9dd021aa20f1410b1810f32
TreeHugger Robot [Wed, 3 May 2017 22:39:04 +0000 (22:39 +0000)]
Merge "Add compatibility matrices to VintfObject.report()" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 22:38:23 +0000 (22:38 +0000)]
Merge "Make all FrameBuilderTests run on RT" into oc-dev
Fyodor Kupolov [Wed, 3 May 2017 22:26:14 +0000 (22:26 +0000)]
Merge "Use timeout for *dexopt* wake lock" into oc-dev
am:
bca6bd2b8c
Change-Id: If4bb1b78fc1cc3f8bc6987bd8bfcfa5738c5c0e9
Fyodor Kupolov [Wed, 3 May 2017 22:15:23 +0000 (22:15 +0000)]
Merge "Use timeout for *dexopt* wake lock" into oc-dev
Ian Pedowitz [Wed, 3 May 2017 22:00:56 +0000 (22:00 +0000)]
Revert "O is API 26"
This reverts commit
9bcef8e2da32ba959b61a0b400adfe9fde1a2a10.
Reason for revert: b/
37355569
Bug:
37480230
Bug:
37355569
Change-Id: I39b4a7fd9bda77df0746c7bc32b87f0c2b722f2b
Sundeep Ghuman [Wed, 3 May 2017 21:30:17 +0000 (21:30 +0000)]
Merge "Fix Array Index out of bounds error." into oc-dev
am:
5c05814af4
Change-Id: I11b957781eaab2702b3c7f1466c89ce60a5c30c8
Adrian Roos [Wed, 3 May 2017 21:23:01 +0000 (21:23 +0000)]
Merge "Notification: Remove actions from public view" into oc-dev
am:
37963d61b2
Change-Id: I845cdc55b23f797b81adc08ef554831018822777
TreeHugger Robot [Wed, 3 May 2017 21:22:44 +0000 (21:22 +0000)]
Merge "Fix Array Index out of bounds error." into oc-dev
Fyodor Kupolov [Wed, 3 May 2017 21:13:47 +0000 (21:13 +0000)]
Merge "Prevent NPE in startActivityUnchecked" into oc-dev
am:
45a5adadbd
Change-Id: I6b8f626fd9e7590a2bf12123ee42c7dcdbc0444f
Adrian Roos [Wed, 3 May 2017 21:11:36 +0000 (21:11 +0000)]
Merge "Notification: Remove actions from public view" into oc-dev
Felipe Leme [Wed, 3 May 2017 21:03:58 +0000 (21:03 +0000)]
Merge "Send AutofillValue of Views that originated a forced request." into oc-dev
am:
943242804e
Change-Id: I276b7650824571bc73102a4c014b4e120d3fb4ee
Fyodor Kupolov [Wed, 3 May 2017 20:59:04 +0000 (20:59 +0000)]
Merge "Prevent NPE in startActivityUnchecked" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 20:54:27 +0000 (20:54 +0000)]
Merge "Send AutofillValue of Views that originated a forced request." into oc-dev
Adrian Roos [Wed, 3 May 2017 20:28:06 +0000 (20:28 +0000)]
Merge "AOD: Pass through pulse reason to DozeUi" into oc-dev
am:
838e5f04be
Change-Id: Ia14a5339053ac91ce4f08e1fde33fd6c2816ffe5
Chris Tate [Wed, 3 May 2017 20:23:32 +0000 (20:23 +0000)]
Merge "Don't mix "current dataset" tokens for different backup transports" into oc-dev
am:
70a2316ec7
Change-Id: Ifc4be7cab333d1956b3b6543e846489f686981ed