OSDN Git Service
Geoffrey Pitsch [Mon, 15 May 2017 20:17:55 +0000 (20:17 +0000)]
Merge "Center switch vertically with primary text" into oc-dev
am:
4b2cecbb53
Change-Id: I07e16d38defe17b09d24bb8f19994564773e0540
TreeHugger Robot [Mon, 15 May 2017 20:10:58 +0000 (20:10 +0000)]
Merge "Center switch vertically with primary text" into oc-dev
Jeff Tinker [Mon, 15 May 2017 20:03:16 +0000 (20:03 +0000)]
Merge "Fix drm hal resource leaks" into oc-dev
am:
63398bbd71
Change-Id: Iae4c7f407e638dd2dba5acfc43a3ca894f665bd4
TreeHugger Robot [Mon, 15 May 2017 19:54:09 +0000 (19:54 +0000)]
Merge "Fix drm hal resource leaks" into oc-dev
Winson Chung [Mon, 15 May 2017 19:41:59 +0000 (19:41 +0000)]
Merge "Ensure that we check against the pending state while suspended." into oc-dev
am:
70a8e86918
Change-Id: Iadf91f728260c235255a79871e6a5f9d3b884de2
Winson Chung [Mon, 15 May 2017 19:31:06 +0000 (19:31 +0000)]
Merge "Ensure that we check against the pending state while suspended." into oc-dev
Paul Duffin [Mon, 15 May 2017 19:28:08 +0000 (19:28 +0000)]
Merge "Moved c.a.i.u.Predicate[s] into legacy-test" am:
e476a30575 am:
3215c85de9
am:
19e2a75bf0 -s ours
Change-Id: Icb146259935a138dc45b91c0f023035aed72cb5a
Paul Duffin [Mon, 15 May 2017 19:19:30 +0000 (19:19 +0000)]
Merge "Moved c.a.i.u.Predicate[s] into legacy-test" am:
e476a30575
am:
3215c85de9
Change-Id: Ib64efa0332d5f5bdbab99f3271bc058c54bfaa35
Paul Duffin [Mon, 15 May 2017 19:11:08 +0000 (19:11 +0000)]
Merge "Moved c.a.i.u.Predicate[s] into legacy-test"
am:
e476a30575
Change-Id: Ia0b3ebd30e045fe2b26fe9a78b2de665bf960b0c
Paul Duffin [Mon, 15 May 2017 18:58:45 +0000 (18:58 +0000)]
Merge "Moved c.a.i.u.Predicate[s] into legacy-test"
Amith Yamasani [Mon, 15 May 2017 17:44:46 +0000 (17:44 +0000)]
Merge "Map isolated processes to correct uid" into oc-dev
am:
ba4ac09d23
Change-Id: I44e106b59854a12d8f871cbf595574a4b345dd4a
Hyunyoung Song [Mon, 15 May 2017 17:41:38 +0000 (17:41 +0000)]
Merge "Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap shortcuts)" into oc-dev
am:
10abacf3f3
Change-Id: I1872725e46ac5ccf9f51d2a0818a93d55a094d01
Amith Yamasani [Mon, 15 May 2017 17:36:30 +0000 (17:36 +0000)]
Merge "Map isolated processes to correct uid" into oc-dev
Hyunyoung Song [Mon, 15 May 2017 17:36:09 +0000 (17:36 +0000)]
Merge "Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap shortcuts)" into oc-dev
Hyunyoung Song [Mon, 15 May 2017 17:12:11 +0000 (10:12 -0700)]
Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap shortcuts)
b/
38304824
Test: cts tests in ag/
2262246 and also full build and tried the system image.
Change-Id: I8f021aa2bb1a0e99597bc00064ab1e9d85569bcb
Ying Xu [Mon, 15 May 2017 17:20:58 +0000 (17:20 +0000)]
Merge "Add API to support async network scans." am:
625d5a9dd9 am:
8d692eb811
am:
31aff5459b
Change-Id: I416017e17a3e1cd837541440ef0ac44c5184dad2
Ying Xu [Mon, 15 May 2017 17:12:59 +0000 (17:12 +0000)]
Merge "Add API to support async network scans." am:
625d5a9dd9
am:
8d692eb811
Change-Id: I0aef12a6d1617b594cd1ed050ed0a02043ae5aba
Phil Weaver [Mon, 15 May 2017 17:05:31 +0000 (17:05 +0000)]
Merge "Add null check to a11y call." into oc-dev
am:
9289faa163
Change-Id: I9e9232a1cef8cd29909233995e983eda98872568
Ying Xu [Mon, 15 May 2017 17:04:43 +0000 (17:04 +0000)]
Merge "Add API to support async network scans."
am:
625d5a9dd9
Change-Id: Iac369e26f707e59095ae7a89bfb11324e12634dc
Ying Xu [Mon, 15 May 2017 16:57:04 +0000 (16:57 +0000)]
Merge "Add API to support async network scans."
Phil Weaver [Mon, 15 May 2017 16:56:24 +0000 (16:56 +0000)]
Merge "Add null check to a11y call." into oc-dev
Sumir Kataria [Mon, 15 May 2017 16:45:57 +0000 (16:45 +0000)]
Merge "Use placeholderCount-1 if using default layout." into oc-dev
am:
260d6c6e8c
Change-Id: Ie4ec53faee984a427e4e175255794a668e02b2a6
Sumir Kataria [Mon, 15 May 2017 16:35:26 +0000 (16:35 +0000)]
Merge "Use placeholderCount-1 if using default layout." into oc-dev
Jeff Tinker [Tue, 9 May 2017 02:22:06 +0000 (19:22 -0700)]
Fix drm hal resource leaks
bug:
36408047
test: manual testing to verify leaks are fixed
Change-Id: Ic6a29572874a9fe30f36e7fdabb68d2ddeffb278
Rubin Xu [Mon, 15 May 2017 16:10:04 +0000 (16:10 +0000)]
Merge "Fix a deadlock in LockSettingsService" into oc-dev
am:
00496c40f6
Change-Id: I112cb14469f644fd38da561e491c580c01a1e7b3
TreeHugger Robot [Mon, 15 May 2017 16:01:51 +0000 (16:01 +0000)]
Merge "Fix a deadlock in LockSettingsService" into oc-dev
Geoffrey Pitsch [Fri, 12 May 2017 18:19:29 +0000 (14:19 -0400)]
Center switch vertically with primary text
Fixes:
38248336
Test: manual
Change-Id: I48bfb244abff47c16ca1f24c0027448a2a238015
Geoffrey Pitsch [Mon, 15 May 2017 14:24:25 +0000 (14:24 +0000)]
Merge "Fix number of channels in inline notification settings" into oc-dev
am:
1ab1da3f25
Change-Id: Iae226f9da2ff9f4ee63945c41d6f9ad1685d8286
TreeHugger Robot [Mon, 15 May 2017 14:18:17 +0000 (14:18 +0000)]
Merge "Fix number of channels in inline notification settings" into oc-dev
Paul Duffin [Tue, 9 May 2017 14:52:46 +0000 (15:52 +0100)]
Moved c.a.i.u.Predicate[s] into legacy-test
These classes are only used by android.test classes that are
being removed. As their name suggests they should not be in the
Android API at all so it makes sense to remove them. Especially
as there is java.lang.function.Predicate available now.
It appears as though Predicate was only added in to the API
because it was used by a method in the API as the directory in
which it and Predicates live was not on the list of classes to
explicitly index. Moving it into legacy-test meant that they are
now being indexed explicitly which means that Predicates needs
to be hidden.
Keeps running the tests as part of the existing target.
At runtime apps targeted at the API version before these are
removed will have the legacy-test library automatically added
to their classpath so they should see no effect. Apps that
target a later API will have to include those classes from the
android.legacy.test.jar which will contain all the android.test
classes that depend on it as well.
Bug:
30188076
Test: make checkbuild
Change-Id: Ia8502ec77ac11f85e078d70b68df214a9435eee7
Merged-In: I6f6f5f16fe93bd80227a450c6254166632fc6813
Peeyush Agarwal [Mon, 15 May 2017 14:07:20 +0000 (14:07 +0000)]
Fix broken MenuItem coretests
am:
101ab58e26
Change-Id: I5fa8da7c7455aa1e72924ea04d8e43580ed69765
Peeyush Agarwal [Thu, 11 May 2017 13:19:22 +0000 (14:19 +0100)]
Fix broken MenuItem coretests
- Fix MenuItemImpl setShortcut bug caused when method signature was
changed after API review
- Remove outdated MenuItem coretests and move others to CTS
Bug:
38114634
Test: Run `cts-tradefed run cts-dev -m CtsViewTestCases -t
android.view.cts.MenuTest`
Change-Id: Iebb7e314cbb3f812fcfeb3f95797f1cf1bcfbae2
(cherry picked from commit
d70d2e6efccf186af08289eb5dc5fe1835b753ed)
Rubin Xu [Mon, 15 May 2017 10:50:09 +0000 (11:50 +0100)]
Fix a deadlock in LockSettingsService
Order of taking locks in LSS: mSeparateChallengeLock -> mSpManager -> this.
Since getGateKeeperService().getSecureUserId() will end up calling
getSeparateProfileChallengeEnabled() which tries to acquire mSeparateChallengeLock
, we shouldn't be holding this lock while calling getSecureUserId()
Also spell out the order of taking locks in a comment.
Test: while device lockscreen is being changed, run "adb shell dumpsys lock_settings"
and verify device is not locked up.
Bug:
37663848
Change-Id: I6b780ab5d1e33b07392f0ab0df29ecc3956f89ff
Svet Ganov [Mon, 15 May 2017 13:23:19 +0000 (13:23 +0000)]
Merge "Hadler USER_ALL when uninstalling static shared lib" into oc-dev
am:
4c25935bfe
Change-Id: I749fdd31dda412058b8ef598e1b876e0b3a24c30
TreeHugger Robot [Mon, 15 May 2017 13:13:46 +0000 (13:13 +0000)]
Merge "Hadler USER_ALL when uninstalling static shared lib" into oc-dev
zhoulei [Mon, 15 May 2017 11:38:48 +0000 (11:38 +0000)]
Merge "update time while network is connected" am:
465f8527dd am:
56ebd7daeb
am:
cbd1e487ba
Change-Id: I5384e7415b308a8c809e908bf3bdf5f1364f9391
zhoulei [Mon, 15 May 2017 11:30:45 +0000 (11:30 +0000)]
Merge "update time while network is connected" am:
465f8527dd
am:
56ebd7daeb
Change-Id: Ia9287a828d40696f180599d58fbf1b4f0aea5449
zhoulei [Mon, 15 May 2017 11:22:45 +0000 (11:22 +0000)]
Merge "update time while network is connected"
am:
465f8527dd
Change-Id: I863c775015079a21098efd32b570acf8a8b53efa
Svet Ganov [Mon, 15 May 2017 11:22:42 +0000 (11:22 +0000)]
Merge "Query for static shared libs as well when needed" into oc-dev
am:
721a348839
Change-Id: I238e73b64b10dab508e3c8cb9d02e47de6a01caf
Treehugger Robot [Mon, 15 May 2017 11:14:42 +0000 (11:14 +0000)]
Merge "update time while network is connected"
TreeHugger Robot [Mon, 15 May 2017 11:13:51 +0000 (11:13 +0000)]
Merge "Query for static shared libs as well when needed" into oc-dev
Svet Ganov [Mon, 15 May 2017 09:48:22 +0000 (02:48 -0700)]
Hadler USER_ALL when uninstalling static shared lib
Test: manual - cannot uninstall an lib with cross user dependency
All static shared lib CTS tests pass
bug:
36632264
Change-Id: Idd11405b27ccd8cacc2a50814e1317356689b7d1
Jorim Jaggi [Mon, 15 May 2017 10:47:42 +0000 (10:47 +0000)]
Merge "Relayout before creating surface" into oc-dev
am:
b76845aa42
Change-Id: I8547943c9e67067b896797a6a45410a24b903b77
Paul Duffin [Mon, 15 May 2017 10:44:50 +0000 (10:44 +0000)]
Merge "Moved c.a.i.u.Predicate[s] into legacy-test" into oc-dev-plus-aosp
Jorim Jaggi [Mon, 15 May 2017 10:24:44 +0000 (10:24 +0000)]
Merge "Relayout before creating surface" into oc-dev
Jorim Jaggi [Fri, 12 May 2017 23:24:31 +0000 (01:24 +0200)]
Relayout before creating surface
Since we create starting window surfaces immediately (instead of
waiting for app visibility), we hit a weird corner case in which
the surface was created before the window was laid out. Thus, a
little bit later, we had to call SurfaceControl.setSize, which
made the whole transaction blocking, meaning that we blocked until
the next vsync before returning to the client (starting window).
Fix this by running a layout if the window wasn't laid out yet.
Test: Open hot app, see latency go down by an average of 8ms (up
to 16ms better!)
Bug:
32668632
Change-Id: I9817afc72127e32d7f8f4e497e0dccd7f180a9c0
Tony Mak [Mon, 15 May 2017 09:23:34 +0000 (09:23 +0000)]
Merge "Clear calling identity before binding instant app resolver" into oc-dev
am:
247b9c4a0a
Change-Id: Ib2f5fe61384d763a9504422e92f8a1fca4624248
Svet Ganov [Mon, 15 May 2017 08:17:05 +0000 (01:17 -0700)]
Query for static shared libs as well when needed
System components can see static shared libs but have to
explicitly request that. This change explicitly requests
static shared libs as well in the package manager shell
command, the package installer and the package manager
where needed.
Test: Static shared lib CTS tests pass
bug:
36632271
Change-Id: I26804571be327888b830e2f6bccdcbaa820f763c
TreeHugger Robot [Mon, 15 May 2017 09:18:22 +0000 (09:18 +0000)]
Merge "Clear calling identity before binding instant app resolver" into oc-dev
Hugo Benichi [Mon, 15 May 2017 06:17:03 +0000 (06:17 +0000)]
Merge "ConnectivityService: minor formatting change" am:
4c949ee07c am:
9374e0b598
am:
88a3389b2c
Change-Id: I5ce0d4a057edc0512f45d8cbf760bab1d2824183
Hugo Benichi [Mon, 15 May 2017 06:08:28 +0000 (06:08 +0000)]
Merge "ConnectivityService: minor formatting change" am:
4c949ee07c
am:
9374e0b598
Change-Id: Iddfb8c44b1fc539039dd0b32daa64ac538cb285f
Hugo Benichi [Mon, 15 May 2017 06:00:59 +0000 (06:00 +0000)]
Merge "ConnectivityService: minor formatting change"
am:
4c949ee07c
Change-Id: Icb420ee636270ca07553de64958b04759986d11f
Hugo Benichi [Mon, 15 May 2017 05:50:35 +0000 (05:50 +0000)]
Merge "ConnectivityService: minor formatting change"
Hugo Benichi [Mon, 15 May 2017 04:47:46 +0000 (04:47 +0000)]
Merge "CaptivePortal: login activity UI improvements" into oc-dev
am:
f0223b1fa8 -s ours
Change-Id: I155fce6d4a9a7dca8021f4238fa152b0c6e16e79
Jaewan Kim [Mon, 15 May 2017 04:41:57 +0000 (04:41 +0000)]
Merge "Fix MediaSessionManager.Callback to be called with the media button session" into oc-dev
am:
cadb3054cf
Change-Id: Ic7d1774707a6ca6ccf1f4921c7db82dcd6b45bbd
Jaewan Kim [Mon, 15 May 2017 04:39:38 +0000 (04:39 +0000)]
Merge "Launch voice assistant by the KEYCODE_MEDIA_PLAY_PAUSE" into oc-dev
am:
37659eed7d
Change-Id: I454151eb9e14809a2cda0b2a3f1e3718caf09ac3
Hugo Benichi [Mon, 15 May 2017 04:35:41 +0000 (04:35 +0000)]
Merge "CaptivePortal: login activity UI improvements" into oc-dev
Bill Yi [Mon, 15 May 2017 04:32:03 +0000 (04:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
63a41f4e5c -s ours
Change-Id: I9d561383cce7f5e979a920910f8556749bb67635
TreeHugger Robot [Mon, 15 May 2017 04:28:05 +0000 (04:28 +0000)]
Merge "Fix MediaSessionManager.Callback to be called with the media button session" into oc-dev
TreeHugger Robot [Mon, 15 May 2017 04:27:32 +0000 (04:27 +0000)]
Merge "Launch voice assistant by the KEYCODE_MEDIA_PLAY_PAUSE" into oc-dev
TreeHugger Robot [Mon, 15 May 2017 04:23:58 +0000 (04:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Hugo Benichi [Mon, 15 May 2017 02:32:21 +0000 (02:32 +0000)]
Merge "CaptivePortal: login activity UI improvements" am:
cb570ec50a am:
95e0e08f61
am:
2bf886d648
Change-Id: I41c965f920911cac9d858f88fcc59b7b78fdef53
Hugo Benichi [Mon, 15 May 2017 02:26:44 +0000 (02:26 +0000)]
Merge "CaptivePortal: login activity UI improvements" am:
cb570ec50a
am:
95e0e08f61
Change-Id: I59a4d6daa591e577b6fd8e421c4f8fa5e26224d3
Hugo Benichi [Mon, 15 May 2017 02:18:47 +0000 (02:18 +0000)]
Merge "CaptivePortal: login activity UI improvements"
am:
cb570ec50a
Change-Id: I5ee0a2dbbb36e66822f4539f6b186df23a7438da
Hugo Benichi [Thu, 11 May 2017 00:58:14 +0000 (09:58 +0900)]
CaptivePortal: login activity UI improvements
Similarly to commit
2e0915f14384901f25a41d698b39ef0add201550 for the
carrier portal login, this patch changes the default settings of the
webview used for the system captive portal login activity to allow
better user experience on "wide" login pages designed for desktop.
Test: manually tested with captive portals.
Bug:
31813936,
19228946,
36532213
Change-Id: Ib84fd351e47e951d24f297bc7de1b035b51cf24f
Merged-In: I2579994da37f3b0f4c08e24e59c81f31835ab832
(cherry picked from commit
f7eea406c950e447608c6f62de05158334682365)
Hugo Benichi [Mon, 15 May 2017 02:08:46 +0000 (02:08 +0000)]
Merge "CaptivePortal: login activity UI improvements"
Hugo Benichi [Wed, 26 Apr 2017 05:53:28 +0000 (14:53 +0900)]
ConnectivityService: minor formatting change
This patch adds a space character between "synchronized" and
"(mTheLockVariable)" so that all synchronized block have a consistent
syntax. Basic stats shows that "synchronized (" is x10 time more likely
than "synchronized(".
This facilitates finding all locked sections by grepping.
Test: no semantics changes
Bug:
37119619
Change-Id: Id860700efa85ffebafed11af3a2997bc115d9c03
Felipe Leme [Sun, 14 May 2017 20:58:53 +0000 (20:58 +0000)]
Merge "Fixed and improved (for reuse) PendingRequest lifecycle." into oc-dev
am:
54ddf4a4e2
Change-Id: I5bc091f40c1a5abffa17d5d1bda852589856ebf7
TreeHugger Robot [Sun, 14 May 2017 20:50:40 +0000 (20:50 +0000)]
Merge "Fixed and improved (for reuse) PendingRequest lifecycle." into oc-dev
Felipe Leme [Sun, 14 May 2017 09:41:00 +0000 (09:41 +0000)]
Start a new session on manual request after session is "gone".
am:
7f33cd350b
Change-Id: I1f93cea2d1699e8d388da4136c379aec4462e270
Felipe Leme [Thu, 11 May 2017 17:10:49 +0000 (10:10 -0700)]
Start a new session on manual request after session is "gone".
When the autofill service returns a null FillResponse, the session is marked
"gone" because the service cannot autofill it. But there might be cases where
the view structure change and it's now autofillable, so need to allow users
to manually request autofill again in such cases.
Fixes:
38205945
Test: CtsAutoFillServiceTestCases pass
Test: LoginActivityTest.testAutofillManuallyAfterServiceReturnedNoDatasets()
Test: LoginActivityTest.testAutofillManuallyAndSaveAfterServiceReturnedNoDatasets()
Change-Id: I9b23c255e563dd0646bf266d31ddb10dcc4f7f6d
Felipe Leme [Sun, 14 May 2017 03:51:16 +0000 (03:51 +0000)]
Merge "Don't print sensitive data on AssistStructure.dump()" into oc-dev
am:
7bd1d3e48b
Change-Id: I8a186cf8fefe19d936acbbf19ae65a6e645eca4d
TreeHugger Robot [Sun, 14 May 2017 03:45:18 +0000 (03:45 +0000)]
Merge "Don't print sensitive data on AssistStructure.dump()" into oc-dev
Felipe Leme [Fri, 12 May 2017 00:46:36 +0000 (17:46 -0700)]
Don't print sensitive data on AssistStructure.dump()
Test: manual verification
Bug:
38205945
Change-Id: Ic184ee6da313a2c0f8e0dd11979f6985d8023140
Dianne Hackborn [Sat, 13 May 2017 20:15:14 +0000 (20:15 +0000)]
Merge "Fix issue #
38210653: Few more tweaks of job scheduler" into oc-dev
am:
c75bd416e9
Change-Id: I6c7cf4506c73fbed60bff0d43fb0a588d780d93a
Dianne Hackborn [Sat, 13 May 2017 20:08:19 +0000 (20:08 +0000)]
Merge "Fix issue #
38210653: Few more tweaks of job scheduler" into oc-dev
Jason Monk [Sat, 13 May 2017 13:16:50 +0000 (13:16 +0000)]
Merge "Fix the status icon colors in QS" into oc-dev
am:
d472349229
Change-Id: I052e36141f36ed48ae9b60d210efd9be7bd4cc2b
Jason Monk [Sat, 13 May 2017 13:10:52 +0000 (13:10 +0000)]
Merge "Fix the status icon colors in QS" into oc-dev
Jorim Jaggi [Sat, 13 May 2017 13:03:18 +0000 (13:03 +0000)]
Merge changes I7b5504d0,I10c263dc into oc-dev
am:
8902bbe4e3
Change-Id: I6cabb34e39f60ad2c952cb5f5972d0853c48ee49
TreeHugger Robot [Sat, 13 May 2017 12:57:18 +0000 (12:57 +0000)]
Merge changes I7b5504d0,I10c263dc into oc-dev
* changes:
Get rid of a lot of binder calls
Fix recents entry delay
Bill Yi [Sat, 13 May 2017 11:11:12 +0000 (04:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4c22a6f78ff012791677fe6935351f008108dcb9
Auto-generated-cl: translation import
Jorim Jaggi [Fri, 12 May 2017 14:32:58 +0000 (16:32 +0200)]
Get rid of a lot of binder calls
Lead to delays when entering recents.
Test: Open recents
Bug:
32668632
Change-Id: I7b5504d0c11208d9c4d55de2eace6407d186f25c
Jorim Jaggi [Fri, 12 May 2017 13:40:43 +0000 (15:40 +0200)]
Fix recents entry delay
- Start loading things after we drew our first frame.
- Don't load high res task until low res tasks have been loaded:
In case the snapshot is already in cache in system_server the
low-res task loader will load the full res snapshot, leading to
GC pressure due to registerNativeAlloc. Now, if both task loader
load the same snapshot at the same time we are very likely
to trigger a blocking GC alloc.
Test: Open recents, look at systrace
Change-Id: I10c263dc8929742611ad9fbb32f65bc8ac3100bd
Fixes:
36851903
Bug:
32668632
Bill Yi [Sat, 13 May 2017 06:46:26 +0000 (06:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
605351c56c -s ours
Change-Id: I8ef13fcf2fa2400e538cbfa504e0de278efacceb
TreeHugger Robot [Sat, 13 May 2017 06:39:13 +0000 (06:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Felipe Leme [Sat, 13 May 2017 03:58:48 +0000 (03:58 +0000)]
Merge "Couple autofill fixes." into oc-dev
am:
5fd8672d71
Change-Id: I767486242a6c8494e70710622029b9e03d621a9e
TreeHugger Robot [Sat, 13 May 2017 03:54:18 +0000 (03:54 +0000)]
Merge "Couple autofill fixes." into oc-dev
Aurimas Liutikas [Sat, 13 May 2017 03:42:13 +0000 (03:42 +0000)]
Merge "Allow users to quickly focus the minute field in TimePicker." into oc-dev
am:
e85b6e4a1f
Change-Id: I6a75bbdfdee181d22700e76ed89b7ee2a8df9246
TreeHugger Robot [Sat, 13 May 2017 03:37:35 +0000 (03:37 +0000)]
Merge "Allow users to quickly focus the minute field in TimePicker." into oc-dev
Stan Iliev [Sat, 13 May 2017 01:52:23 +0000 (01:52 +0000)]
Merge "Fix recent apps in system UI for Skia pipeline" into oc-dev
am:
dad0ba155e
Change-Id: Ibd006617200e11ac929b23da279e099c9fce4ca1
Bryce Lee [Sat, 13 May 2017 01:49:28 +0000 (01:49 +0000)]
Merge "Introduce result ranges for activity start return results." into oc-dev
am:
b3d265caaa
Change-Id: I609d209e8a5a8dc0ce936c9ac644f9a128c5d641
TreeHugger Robot [Sat, 13 May 2017 01:41:53 +0000 (01:41 +0000)]
Merge "Fix recent apps in system UI for Skia pipeline" into oc-dev
Bryce Lee [Sat, 13 May 2017 01:41:32 +0000 (01:41 +0000)]
Merge "Introduce result ranges for activity start return results." into oc-dev
Adam Lesinski [Sat, 13 May 2017 00:51:37 +0000 (00:51 +0000)]
Merge "OMS: Setup state for users on boot and when added" into oc-dev
am:
47fe4a0bef
Change-Id: I9af3f518addb4124e4f59c5a012e8a88c387ae54
Jayachandran Chinnakkannu [Sat, 13 May 2017 00:49:11 +0000 (00:49 +0000)]
Merge "Add new reason code for IMS Call ended during conference merge process" into oc-dev
am:
a1755c4fd6
Change-Id: I4643358d6823fe56c31ac279ce34fe18710c4889
Vladislav Kaznacheev [Sat, 13 May 2017 00:42:47 +0000 (00:42 +0000)]
Merge "Revert "Respect PopupWindow.setOverlapAnchor when above anchor"" into oc-dev
am:
22c6f2d3a8
Change-Id: I2f5393e3eb5d168f771f519e5d039289a47a183e
TreeHugger Robot [Sat, 13 May 2017 00:35:39 +0000 (00:35 +0000)]
Merge "OMS: Setup state for users on boot and when added" into oc-dev
Jayachandran Chinnakkannu [Sat, 13 May 2017 00:35:05 +0000 (00:35 +0000)]
Merge "Add new reason code for IMS Call ended during conference merge process" into oc-dev
TreeHugger Robot [Sat, 13 May 2017 00:34:34 +0000 (00:34 +0000)]
Merge "Revert "Respect PopupWindow.setOverlapAnchor when above anchor"" into oc-dev
Kevin Chyn [Sat, 13 May 2017 00:32:46 +0000 (00:32 +0000)]
Merge "Add missing break statements in FingerprintManager" into oc-dev
am:
e25a2564e5
Change-Id: Iae1ded28be8ea7df2c466ce2592a5574b1cee994