OSDN Git Service
Yifan Hong [Mon, 1 May 2017 22:30:02 +0000 (22:30 +0000)]
Merge "Add android.os.VintfRuntimeInfo" into oc-dev am:
1f66f42c9f
am:
b06a1541b8
Change-Id: I4bfe271785a25318b6add0c1a6a6e965b49a132f
Jeff Sharkey [Mon, 1 May 2017 22:21:34 +0000 (22:21 +0000)]
Merge "hotspot2: update method name for timestamp related APIs" into oc-dev am:
b6f66cf931
am:
28b08173da
Change-Id: I4d019e13e0d7bb5d7f1bada97bfa7948a1b650ac
Yifan Hong [Mon, 1 May 2017 22:19:39 +0000 (22:19 +0000)]
Merge "Add android.os.VintfRuntimeInfo" into oc-dev
am:
1f66f42c9f
Change-Id: Idd98689a56fdac2024884e197bd74bc2864155cb
TreeHugger Robot [Mon, 1 May 2017 22:15:02 +0000 (22:15 +0000)]
Merge "Add "When to start" definitions to DreamBackend"
Jeff Sharkey [Mon, 1 May 2017 22:09:28 +0000 (22:09 +0000)]
Merge "hotspot2: update method name for timestamp related APIs" into oc-dev
am:
b6f66cf931
Change-Id: I9855d7d255e8180992e55f8695439a1463b51f00
Yifan Hong [Mon, 1 May 2017 22:02:15 +0000 (22:02 +0000)]
Merge "Add android.os.VintfRuntimeInfo" into oc-dev
Jeff Sharkey [Mon, 1 May 2017 21:57:28 +0000 (21:57 +0000)]
Merge "hotspot2: update method name for timestamp related APIs" into oc-dev
Daniel Nishi [Mon, 1 May 2017 21:54:52 +0000 (21:54 +0000)]
Merge "Make PrivateStorageInfo have a public constructor." into oc-dev am:
71a17a4307
am:
b03a1424dc
Change-Id: I29bab61979db7db4199a53aa144cb680e00f9bdf
Badhri Jagan Sridharan [Mon, 1 May 2017 21:52:30 +0000 (21:52 +0000)]
Merge "Notify the user when an unsupported accessory is attached"
Daniel Nishi [Mon, 1 May 2017 21:46:33 +0000 (21:46 +0000)]
Merge "Make PrivateStorageInfo have a public constructor." into oc-dev
am:
71a17a4307
Change-Id: Ia0f34432603380ae9c8c135a0c5439db86ed6bb6
Daniel Nishi [Mon, 1 May 2017 21:40:17 +0000 (21:40 +0000)]
Merge "Make PrivateStorageInfo have a public constructor." into oc-dev
Matthew Ng [Mon, 1 May 2017 20:54:22 +0000 (20:54 +0000)]
All taps under max double tap timeout are quick taps am:
da3dd7c0cf
am:
8c12597fb5
Change-Id: I4583e822d6b1c469c1c6acccb78f5d5e3a0a783a
Matthew Ng [Mon, 1 May 2017 20:48:47 +0000 (20:48 +0000)]
All taps under max double tap timeout are quick taps
am:
da3dd7c0cf
Change-Id: Ic8be4a866662662ed0226f81bf67282b26324871
Matthew Ng [Sat, 29 Apr 2017 00:33:22 +0000 (17:33 -0700)]
All taps under max double tap timeout are quick taps
When tapping rapidly on the overview button on a recents grid device
(like tablets), users might tap very quickly that would have triggered a
elasped time under the min double tap time (40ms) which would cause the
button to not be a quick tap. Removing the check allows all taps under
the max double tap timeout to be a quick tap. Then quickly tapping the
overview button would not confuse alt-tab with resume same task
functionality.
Test: manual
Change-Id: I9161fd5b68c299dc794e538a4fd9021ae98c7e94
Fixes:
36886408
Evan Laird [Wed, 26 Apr 2017 18:12:34 +0000 (14:12 -0400)]
Add "When to start" definitions to DreamBackend
Eases the logic of talking to DreamBackend from settings in that you can
now ask it for a constant describing when the screen saver will turn on.
Test: none
Bug:
35031991
Change-Id: I4a35620b9baf1830998fd4b3e6ebcfe663d5c8ad
Jean-Michel Trivi [Mon, 1 May 2017 20:09:41 +0000 (20:09 +0000)]
Merge "Audio focus: fix mapping of old requestAudioFocus to AudioFocusRequest" into oc-dev am:
a08ba3ef31
am:
43c34ae003
Change-Id: If55c6cc4e9130359207a33cc006820313df8db96
Casey Burkhardt [Mon, 1 May 2017 20:06:48 +0000 (20:06 +0000)]
Merge "Fix accessibility button CTS test" into oc-dev am:
921384157d
am:
8c12b2138a
Change-Id: Id55f90417710fc44c439eabb6dd8dd573c748b35
Yifan Hong [Wed, 26 Apr 2017 18:38:01 +0000 (11:38 -0700)]
Add android.os.VintfRuntimeInfo
This is the Java API for ::android::vintf::RuntimeInfo.
This will be used by CTS for device info report purposes.
Bug:
28656227
Test: cts-tradefed run cts -m CtsEdiHostTestCases --skip-preconditions
Change-Id: Id87c95a17e77d7ec1794a6f850de97edf9ae892d
Jean-Michel Trivi [Mon, 1 May 2017 19:59:14 +0000 (19:59 +0000)]
Merge "Audio focus: fix mapping of old requestAudioFocus to AudioFocusRequest" into oc-dev
am:
a08ba3ef31
Change-Id: I95991e5b2151f689b27e32bd5f187dc4615f1bf0
Casey Burkhardt [Mon, 1 May 2017 19:55:30 +0000 (19:55 +0000)]
Merge "Fix accessibility button CTS test" into oc-dev
am:
921384157d
Change-Id: Ie1770cf5803e595ac5bf085028ace1879a661499
Makoto Onuki [Mon, 1 May 2017 19:50:57 +0000 (19:50 +0000)]
Merge "Move the last user save from onCleanupUser to onStopUser" into oc-dev am:
f323e3a543
am:
7d10161005
Change-Id: I72d067bc5225641a3d1a6aa83f678bbad11f944c
Jean-Michel Trivi [Mon, 1 May 2017 19:50:38 +0000 (19:50 +0000)]
Merge "Audio focus: fix mapping of old requestAudioFocus to AudioFocusRequest" into oc-dev
Casey Burkhardt [Mon, 1 May 2017 19:49:08 +0000 (19:49 +0000)]
Merge "Fix accessibility button CTS test" into oc-dev
Dianne Hackborn [Mon, 1 May 2017 19:45:59 +0000 (19:45 +0000)]
Merge "Fix stupid bug." into oc-dev am:
36fd25eec5
am:
9acb4c90b3
Change-Id: I512e780496b4f9d6c60714de06ba1705a1ca1ca3
Makoto Onuki [Mon, 1 May 2017 19:40:23 +0000 (19:40 +0000)]
Merge "Move the last user save from onCleanupUser to onStopUser" into oc-dev
am:
f323e3a543
Change-Id: I77c183728a66b94a1fc3b92730596b5c4a77c5db
Dianne Hackborn [Mon, 1 May 2017 19:38:17 +0000 (19:38 +0000)]
Merge "Fix stupid bug." into oc-dev
am:
36fd25eec5
Change-Id: I096332ea215a70f40da85cfbdba1140eb770fef4
Jean-Michel Trivi [Mon, 1 May 2017 19:33:40 +0000 (12:33 -0700)]
Audio focus: fix mapping of old requestAudioFocus to AudioFocusRequest
When translating a focus request from the N- API to AudioFocusRequest,
do not do null checks for listener or handler, those are only
for the AudioFocusRequest.Builder.
Test: use app built for N- and request focus, no crash
Bug
37855238
Change-Id: I675b3144e913ab674fe27f9f65ee7a7bea24a72c
TreeHugger Robot [Mon, 1 May 2017 19:31:16 +0000 (19:31 +0000)]
Merge "Move the last user save from onCleanupUser to onStopUser" into oc-dev
TreeHugger Robot [Mon, 1 May 2017 19:30:33 +0000 (19:30 +0000)]
Merge "Fix stupid bug." into oc-dev
TreeHugger Robot [Mon, 1 May 2017 19:23:23 +0000 (19:23 +0000)]
Merge "remove unused private field"
Yi Kong [Mon, 1 May 2017 19:02:56 +0000 (19:02 +0000)]
Merge "Merge "Remove no-op std::max call" am:
c00af4c533 am:
ef5e579cec am:
f3310cb3b1" into oc-dev-plus-aosp
am:
d1a0cdc85f
Change-Id: I5ba3c71615c0c4bbb777d5c31458a586243c67eb
Selim Cinek [Mon, 1 May 2017 19:01:09 +0000 (19:01 +0000)]
Merge "Fixed that snooze options were animating" into oc-dev am:
f12a157531
am:
40e6925859
Change-Id: Ifa16e3b0ce57528fd45264b4f1f04984f5173b2f
Android Build Merger (Role) [Mon, 1 May 2017 18:53:43 +0000 (18:53 +0000)]
Merge "Merge "Remove no-op std::max call" am:
c00af4c533 am:
ef5e579cec am:
f3310cb3b1" into oc-dev-plus-aosp
Jeff Sharkey [Mon, 1 May 2017 18:52:23 +0000 (18:52 +0000)]
Merge "Updates based on API council guidance." into oc-dev am:
3ba7117164
am:
e13d60764c
Change-Id: Ib0a727b11cc24c20d10adf9df85df100f603a87f
Yi Kong [Mon, 1 May 2017 18:51:59 +0000 (18:51 +0000)]
Merge "Remove no-op std::max call" am:
c00af4c533 am:
ef5e579cec
am:
f3310cb3b1
Change-Id: I553be70f9ba04feaf4da01041bfb3edc6ae38252
Selim Cinek [Mon, 1 May 2017 18:51:35 +0000 (18:51 +0000)]
Merge "Fixed that snooze options were animating" into oc-dev
am:
f12a157531
Change-Id: Iaf33f16e0dabb0ca56b890a404500a01d26e579d
Android Build Merger (Role) [Mon, 1 May 2017 18:49:10 +0000 (18:49 +0000)]
Merge "Merge "Use newest scrap view in ListView" into oc-dev am:
ecc0e16e32 am:
e04b73c9a7"
Phil Weaver [Mon, 1 May 2017 18:48:28 +0000 (18:48 +0000)]
Merge "Use newest scrap view in ListView" into oc-dev am:
ecc0e16e32
am:
e04b73c9a7
Change-Id: I931f0317d495e6bc971f1ac4fc02ea0c20b19cf3
Yi Kong [Mon, 1 May 2017 18:46:15 +0000 (18:46 +0000)]
Merge "Remove no-op std::max call" am:
c00af4c533
am:
ef5e579cec
Change-Id: I140b00023b25f2609137eb223ba4641057a418b5
Selim Cinek [Mon, 1 May 2017 18:43:35 +0000 (18:43 +0000)]
Merge "Fixed that snooze options were animating" into oc-dev
Jeff Sharkey [Mon, 1 May 2017 18:43:12 +0000 (18:43 +0000)]
Merge "Updates based on API council guidance." into oc-dev
am:
3ba7117164
Change-Id: I75953e083e10972dcc44c431ff84bf3977e8d442
Jeff Sharkey [Mon, 1 May 2017 18:40:45 +0000 (18:40 +0000)]
Merge "Rename restartOnConfigChanges to recreateOnConfigChanges." into oc-dev am:
a5e8bfe999
am:
edfa1561c5
Change-Id: I4939f105dbc55b1a486d1ecb3a435e651279b2c2
Phil Weaver [Mon, 1 May 2017 18:40:43 +0000 (18:40 +0000)]
Merge "Use newest scrap view in ListView" into oc-dev
am:
ecc0e16e32
Change-Id: I20da3472569c1882f88a56b0e4fd720f75396f7d
Yi Kong [Mon, 1 May 2017 18:40:43 +0000 (18:40 +0000)]
Merge "Remove no-op std::max call"
am:
c00af4c533
Change-Id: I9bbbb3689d51e364752efe7b5f1b21f30bc3de18
Jeff Sharkey [Mon, 1 May 2017 18:36:18 +0000 (18:36 +0000)]
Merge "Updates based on API council guidance." into oc-dev
Jeff Sharkey [Mon, 1 May 2017 18:35:01 +0000 (18:35 +0000)]
Merge "Rename restartOnConfigChanges to recreateOnConfigChanges." into oc-dev
am:
a5e8bfe999
Change-Id: I4921365f720b18d3488da06cbe94a536e6489478
jiabin [Mon, 1 May 2017 18:32:52 +0000 (18:32 +0000)]
Merge "Add parameter for accessing channels from 3rd-party TV apps." into oc-dev am:
f3a5f66139
am:
653263bba4
Change-Id: I62f3775591e65004be4db03cffde2c7c73d22869
TreeHugger Robot [Mon, 1 May 2017 18:31:35 +0000 (18:31 +0000)]
Merge "Use newest scrap view in ListView" into oc-dev
Yi Kong [Mon, 1 May 2017 18:29:24 +0000 (18:29 +0000)]
Merge "Remove no-op std::max call"
jiabin [Mon, 1 May 2017 18:27:09 +0000 (18:27 +0000)]
Merge "Add parameter for accessing channels from 3rd-party TV apps." into oc-dev
am:
f3a5f66139
Change-Id: Ifa88fe71ed6d1b75be62b579908f412019ed68f2
Winson Chung [Mon, 1 May 2017 18:24:43 +0000 (18:24 +0000)]
Merge "Ensure that the action views are always updated." into oc-dev am:
f8e7cbffb9
am:
8c11b89baf
Change-Id: I775435bcf1de8ad6a36cbb407d6eb293cb0b76bc
Jeff Sharkey [Mon, 1 May 2017 18:22:33 +0000 (18:22 +0000)]
Merge "Rename restartOnConfigChanges to recreateOnConfigChanges." into oc-dev
Jeff Sharkey [Mon, 1 May 2017 18:22:23 +0000 (18:22 +0000)]
Merge "Change String to CharSequence in #loadSummary." into oc-dev am:
63827ce61b
am:
f0d14afa61
Change-Id: Ib99d458b6f14dba8c3a62a14fb2d845feea611c4
TreeHugger Robot [Mon, 1 May 2017 18:20:08 +0000 (18:20 +0000)]
Merge "Add parameter for accessing channels from 3rd-party TV apps." into oc-dev
Winson Chung [Mon, 1 May 2017 18:16:42 +0000 (18:16 +0000)]
Merge "Fix issue with double tapping PiP" into oc-dev am:
33d95164ab
am:
f15f678cea
Change-Id: If99b06b060e80c4b05ccc02201a69f2f0d07df5b
Jeff Sharkey [Mon, 1 May 2017 18:14:46 +0000 (18:14 +0000)]
Merge "Removing unnecessary asset." into oc-dev am:
45eed80587
am:
edf5315427
Change-Id: I4769972939781b65585d5017aa1ff0b5b6cad04d
Winson Chung [Mon, 1 May 2017 18:13:19 +0000 (18:13 +0000)]
Merge "Ensure that the action views are always updated." into oc-dev
am:
f8e7cbffb9
Change-Id: I00b603c3bcc4da09d95e1feb8d80bac2626b6b26
Jeff Sharkey [Mon, 1 May 2017 18:10:36 +0000 (18:10 +0000)]
Merge "Change String to CharSequence in #loadSummary." into oc-dev
am:
63827ce61b
Change-Id: Ic7a72161a671de50ade75e670e269523dd78f7fe
Winson Chung [Mon, 1 May 2017 18:08:15 +0000 (18:08 +0000)]
Merge "Fix issue with double tapping PiP" into oc-dev
am:
33d95164ab
Change-Id: I34edd358a3d44e58fbf80661d14d541fcb275de2
Jeff Sharkey [Mon, 1 May 2017 18:06:24 +0000 (18:06 +0000)]
Merge "Removing unnecessary asset." into oc-dev
am:
45eed80587
Change-Id: I52336e75ff507b186ba74b4e5b25ac796fe6dd07
Martijn Coenen [Mon, 1 May 2017 18:03:47 +0000 (18:03 +0000)]
Merge "Increase max system_server hwbinder threadpool to 5." into oc-dev am:
e14513c787
am:
b18823d437
Change-Id: I7567f23415110a7f63bc5504d57ad000bfbb23f9
Martijn Coenen [Mon, 1 May 2017 17:56:33 +0000 (17:56 +0000)]
Merge "Increase max system_server hwbinder threadpool to 5." into oc-dev
am:
e14513c787
Change-Id: Ic56ac41fcb853d142be472a87541b0b4bb132ff5
TreeHugger Robot [Mon, 1 May 2017 17:56:08 +0000 (17:56 +0000)]
Merge "Ensure that the action views are always updated." into oc-dev
Dianne Hackborn [Mon, 1 May 2017 17:54:07 +0000 (10:54 -0700)]
Fix stupid bug.
Test: manual
Change-Id: I1e3bd86eb3e000111721bad82bebdfb491c2e5de
Jeff Sharkey [Mon, 1 May 2017 17:52:22 +0000 (17:52 +0000)]
Merge "Change String to CharSequence in #loadSummary." into oc-dev
TreeHugger Robot [Mon, 1 May 2017 17:50:37 +0000 (17:50 +0000)]
Merge "Fix issue with double tapping PiP" into oc-dev
Jeff Sharkey [Mon, 1 May 2017 17:48:24 +0000 (17:48 +0000)]
Merge "Removing unnecessary asset." into oc-dev
TreeHugger Robot [Mon, 1 May 2017 17:47:00 +0000 (17:47 +0000)]
Merge "Increase max system_server hwbinder threadpool to 5." into oc-dev
Chris Craik [Mon, 1 May 2017 17:40:43 +0000 (17:40 +0000)]
Merge "Move ColorSpace#Renderer tests to APCT" into oc-dev am:
117ce083bf
am:
b55bb70897
Change-Id: I27b17d395ae02fd9fe00c7aaf0ecc5f93cdaceb2
Chris Craik [Mon, 1 May 2017 17:34:59 +0000 (17:34 +0000)]
Merge "Move ColorSpace#Renderer tests to APCT" into oc-dev
am:
117ce083bf
Change-Id: I86a5aec02da2012542fc6b9cbb5bab83d0ca9bf6
Jeff Sharkey [Mon, 1 May 2017 17:34:55 +0000 (17:34 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." into oc-dev am:
e24457409e
am:
9930a35e44
Change-Id: I75d43755aa93fc370fe2c7ff37ec89c4f689eb3b
Badhri Jagan Sridharan [Wed, 19 Apr 2017 01:13:39 +0000 (18:13 -0700)]
Notify the user when an unsupported accessory is attached
This CL pops up a notification to the user when the device does not
support Analog Type-C headphones but the user connects one.
i.e when the Usb port status reports currentMode=audio_acc, but
audio_acc is not present in the supportedModes list.
Bug:
36604276
Test: Manually test inserting an Audio accessory
Change-Id: If514b9f238da196a7157e1aacb6d7690fde66f21
Jeff Sharkey [Mon, 1 May 2017 17:27:32 +0000 (17:27 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." into oc-dev
am:
e24457409e
Change-Id: I5998fd5c20c43a3a5595919abc4c77a0715ab044
TreeHugger Robot [Mon, 1 May 2017 17:23:50 +0000 (17:23 +0000)]
Merge "Move ColorSpace#Renderer tests to APCT" into oc-dev
Jeff Sharkey [Mon, 1 May 2017 17:19:26 +0000 (17:19 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." into oc-dev
Makoto Onuki [Fri, 28 Apr 2017 19:24:16 +0000 (12:24 -0700)]
Move the last user save from onCleanupUser to onStopUser
Bug:
37780857
Test: manual test with work profile
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Change-Id: I8b053c6a55df374a89ab85d76b9d36abf639f649
Salvador Martinez [Mon, 1 May 2017 17:01:13 +0000 (17:01 +0000)]
Merge "Added dialog to notify user of thermal shutdown" into oc-dev am:
4d09adcef1
am:
ba1cc4bb42
Change-Id: I6d0a0c6dc87bac1470eb4cfccee61c878bed9ee3
Salvador Martinez [Mon, 1 May 2017 16:55:44 +0000 (16:55 +0000)]
Merge "Added dialog to notify user of thermal shutdown" into oc-dev
am:
4d09adcef1
Change-Id: Ic53481e2aa95146bc33c21174b1a50f62bdc8851
Matthew Snider [Mon, 1 May 2017 16:55:39 +0000 (16:55 +0000)]
Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev am:
ef08871d6b
am:
fa88787309
Change-Id: Icf3f61c961fcd2684c9b32edd5617f0514445c7d
Matthew Snider [Mon, 1 May 2017 16:46:17 +0000 (16:46 +0000)]
Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev
am:
ef08871d6b
Change-Id: Ib173b22981d9081c184b024d54671729ec081d11
Salvador Martinez [Mon, 1 May 2017 16:45:25 +0000 (16:45 +0000)]
Merge "Added dialog to notify user of thermal shutdown" into oc-dev
Matthew Snider [Mon, 1 May 2017 16:42:19 +0000 (16:42 +0000)]
Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev
Peter Qiu [Mon, 1 May 2017 16:41:14 +0000 (09:41 -0700)]
hotspot2: update method name for timestamp related APIs
Bug:
37514629
Test: build
Change-Id: Iadd8b7a9ea98bc01f796a261293f87173ba1d52f
Jeff Sharkey [Mon, 1 May 2017 16:19:39 +0000 (16:19 +0000)]
Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class." into oc-dev am:
080e16575a
am:
f89879a133
Change-Id: Iac4f73f0c20ce3b95d406d487a5ed2f8ed391033
Jeff Sharkey [Mon, 1 May 2017 16:11:00 +0000 (16:11 +0000)]
Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class." into oc-dev
am:
080e16575a
Change-Id: I8e81a2f5361d2fc6ab61cb38f69fe1e0eb867e63
Jeff Sharkey [Mon, 1 May 2017 16:05:26 +0000 (16:05 +0000)]
Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class." into oc-dev
Jeff Sharkey [Mon, 1 May 2017 15:54:28 +0000 (15:54 +0000)]
Merge "Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI" into oc-dev am:
1c9e549c00
am:
a70ba223b3
Change-Id: Ib0d10d38e7454cc4ee94b9195d81b6a49a56b94a
Winson Chung [Fri, 28 Apr 2017 20:07:46 +0000 (13:07 -0700)]
Removing unnecessary asset.
Bug:
37743450
Test: None, just removing asset
Change-Id: Icbf8c2fd08b3f0ad52ced3dcd8766cd9d055d5fb
Jeff Sharkey [Mon, 1 May 2017 15:45:32 +0000 (15:45 +0000)]
Merge "Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI" into oc-dev
am:
1c9e549c00
Change-Id: I22e49d7404e21917d5e805424cecd2fad50d1aa4
Colin Cross [Mon, 1 May 2017 15:45:10 +0000 (15:45 +0000)]
Add missing symbol am:
316c9ce694 -s ours
am:
7ae8dd91e7
Change-Id: I8e2404d11dafae1113600f2bbcbd08007d8f004a
Colin Cross [Mon, 1 May 2017 15:38:11 +0000 (15:38 +0000)]
Add missing symbol
am:
316c9ce694 -s ours
Change-Id: I6c8785a409b67e819100747267b1b113d35a4eda
Jeff Sharkey [Mon, 1 May 2017 15:37:12 +0000 (15:37 +0000)]
Merge "Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI" into oc-dev
Holly Jiuyu Sun [Fri, 28 Apr 2017 22:34:44 +0000 (15:34 -0700)]
Rename restartOnConfigChanges to recreateOnConfigChanges.
Bug:
37738136
Test: unit test
Change-Id: Icea9faf1d7f55b875d6ff9e4cc9aed4868637895
Colin Cross [Mon, 1 May 2017 01:33:25 +0000 (18:33 -0700)]
Add missing symbol
Bug:
35998031
Test: builds
Change-Id: Ie085b4058c5714df9913ceb9fd03fb4658168520
Mike Reed [Mon, 1 May 2017 14:03:58 +0000 (10:03 -0400)]
remove unused private field
Test: CtsGraphicsTests
Change-Id: I611f5dc127636f67dc219ef15adc0a591a72a95e
Jason Monk [Mon, 1 May 2017 13:39:34 +0000 (13:39 +0000)]
Merge "Fix flaky test?" into oc-dev am:
030107f0bd
am:
16c981ea43
Change-Id: I7162f1b25b97c2f89c45103a6c7b2cf290fc38cd
Jason Monk [Mon, 1 May 2017 13:31:26 +0000 (13:31 +0000)]
Merge "Fix flaky test?" into oc-dev
am:
030107f0bd
Change-Id: I3ae44198c1f15967b8a774a5166c678c0be0ab47
Jason Monk [Mon, 1 May 2017 13:23:17 +0000 (13:23 +0000)]
Merge "Fix flaky test?" into oc-dev
Yi Kong [Mon, 1 May 2017 06:51:33 +0000 (23:51 -0700)]
Remove no-op std::max call
This was calling std::max on an unsigned integer and 0, which is
essentially no-op. Remove this code.
Test: Build
Bug:
37752547
Change-Id: I74ce45b95960621dff11f574fbe1af60ad147cf0
Jean-Michel Trivi [Mon, 1 May 2017 06:49:06 +0000 (06:49 +0000)]
Merge "AudioFocusRequest: more docs, listener without handler" into oc-dev am:
128f8aa8e3
am:
5642a6559b
Change-Id: I37a1a943406ec2384bc403f70b790a56f0fd00d0
OSDN Git Service
