OSDN Git Service
Julia Reynolds [Mon, 1 May 2017 22:31:55 +0000 (22:31 +0000)]
Merge "Do not unsnooze canceled notifications." into oc-dev
am:
8183328af7
Change-Id: I363a606d1f190c2da6cc8fbd76ef0b093efa0a58
Chad Brubaker [Mon, 1 May 2017 22:26:59 +0000 (22:26 +0000)]
Merge changes from topic 'aia_settings_overlay' into oc-dev
am:
bd20a7b263
Change-Id: I6018aca9d49de7cc485ddceb15263a5d9db87d07
Andrii Kulian [Mon, 1 May 2017 22:25:01 +0000 (22:25 +0000)]
Merge "Set stack bounds to null instead of empty for fullscreen" into oc-dev
am:
4268bedead
Change-Id: I2dfcd0f3813800704d1607791546f09c437a2970
TreeHugger Robot [Mon, 1 May 2017 22:23:42 +0000 (22:23 +0000)]
Merge "Do not unsnooze canceled notifications." into oc-dev
Jeremy Joslin [Mon, 1 May 2017 22:22:44 +0000 (22:22 +0000)]
Merge "Marking deprecated recommendation request code as @removed." into oc-dev
am:
9be76f0129
Change-Id: I22805cb4f58481fc7ab1176e470cf4a2981101c5
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
Chad Brubaker [Mon, 1 May 2017 22:12:47 +0000 (22:12 +0000)]
Merge changes from topic 'aia_settings_overlay' into oc-dev
* changes:
Add overlay for Instant Apps Settings whitelists
Revert "Allow Instant Apps to read Settings defined by apps"
TreeHugger Robot [Mon, 1 May 2017 22:11:34 +0000 (22:11 +0000)]
Merge "Set stack bounds to null instead of empty for fullscreen" into oc-dev
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
TreeHugger Robot [Mon, 1 May 2017 22:05:23 +0000 (22:05 +0000)]
Merge "Marking deprecated recommendation request code as @removed." into oc-dev
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: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: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
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
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
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
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
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
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
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
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
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
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
Jeff Sharkey [Mon, 1 May 2017 18:22:33 +0000 (18:22 +0000)]
Merge "Rename restartOnConfigChanges to recreateOnConfigChanges." into oc-dev
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: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 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
Jeremy Joslin [Mon, 1 May 2017 17:02:25 +0000 (10:02 -0700)]
Marking deprecated recommendation request code as @removed.
Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: Built & ran
Bug:
37357264
Change-Id: I6d55fbad87b11c99e7ddac07cfaa82efeee33187
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: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 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: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: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
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: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
Julia Reynolds [Tue, 7 Mar 2017 21:30:21 +0000 (16:30 -0500)]
Do not unsnooze canceled notifications.
Test: runtest systemui-notification
Change-Id: I3edef5822aa74359bf3a34f54f59d4021696365d
Colin Cross [Mon, 1 May 2017 01:33:25 +0000 (18:33 -0700)]
Add missing symbol
Bug:
35998031
Test: builds
Change-Id: Ie085b4058c5714df9913ceb9fd03fb4658168520
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:41:30 +0000 (06:41 +0000)]
Merge "AudioFocusRequest: more docs, listener without handler" into oc-dev
am:
128f8aa8e3
Change-Id: If1ef13a45277b91589b292d8e88af539ee720d03
Jean-Michel Trivi [Mon, 1 May 2017 06:33:01 +0000 (06:33 +0000)]
Merge "AudioFocusRequest: more docs, listener without handler" into oc-dev
Karthik Ravi Shankar [Fri, 28 Apr 2017 18:21:04 +0000 (11:21 -0700)]
Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI
android.permission.RESTRICTED_VR_ACCESS is currently an open API. But
since it can only be used by System Apps because of it's protection
level which is "signature|preinstalled". Change this to a @SystemApi.
Bug:
37724255
Test: run gts --module GtsPermissionTestCases
1. Run with two apps having android.permission.RESTRICTED_VR_ACCESS
before change -- fails.
2. Run with two appshaving android.permission.RESTRICTED_VR_ACCESS
after this change -- passes.
Change-Id: I9e640b0794fa16d03ba22e8aa75175e7e08dd88b
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
Jean-Michel Trivi [Mon, 1 May 2017 01:49:36 +0000 (18:49 -0700)]
AudioFocusRequest: more docs, listener without handler
Focus listener: follow platform pattern for setter of listener
and handler (set(listener) and set(listener, handler) methods).
More docs.
Test: cts-tradefed run cts -m CtsMediaTestCases -t android.media.cts.AudioFocusTest
Bug:
30258418
Change-Id: Ib5d1fbc3cf92821b63ffc1b4ad4cf4384bb6ff54
Rebecca Silberstein [Sun, 30 Apr 2017 22:00:55 +0000 (22:00 +0000)]
Merge "Revert "WifiManager: expose Local Only Hotspot APIs"" into oc-dev
am:
ad4c31fecf
Change-Id: I6aa5630a46e067230b1368f8c119aebaf18bd1d2
Rebecca Silberstein [Sun, 30 Apr 2017 21:54:43 +0000 (21:54 +0000)]
Merge "Revert "WifiManager: expose Local Only Hotspot APIs"" into oc-dev
Rebecca Silberstein [Sun, 30 Apr 2017 20:02:59 +0000 (20:02 +0000)]
Revert "WifiManager: expose Local Only Hotspot APIs"
This reverts commit
ec18f81e5b8bc4e4486b00f37e68cff4ff9131eb.
Reverting the CL to expose the APIs so we have more time for testing
and ironing out the API.
Bug:
31466854
Bug:
37073685
Test: make update-api
Test: make
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I17d4e3e32e28dbbb08ba99c266a9b74044e6001d
Rebecca Silberstein [Sun, 30 Apr 2017 18:38:19 +0000 (18:38 +0000)]
Merge changes I8d149ab0,Ia0a52819,If54a89cb,I20faa733,Ib32dfd23 into oc-dev
am:
07ea44909f
Change-Id: Ia3164a0c4438cb025601f62b097f83f77a69358f
Rebecca Silberstein [Sun, 30 Apr 2017 18:30:43 +0000 (18:30 +0000)]
Merge changes I8d149ab0,Ia0a52819,If54a89cb,I20faa733,Ib32dfd23 into oc-dev
* changes:
WifiManager: expose Local Only Hotspot APIs
WifiManager: implement watch LocalOnlyHotspot
WifiManager: implement start/stopLocalOnlyHotspot
WifiManager: add LocalOnlyHotspotObserverProxy
WifiManager: add LocalOnlyHotspotCallbackProxy
Dianne Hackborn [Sun, 30 Apr 2017 17:34:21 +0000 (17:34 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services can't..." into oc-dev
am:
f1a4b50739
Change-Id: I242303b9dc50a8a69525d26a41cec6c09e361d17
Abodunrinwa Toki [Sun, 30 Apr 2017 17:26:55 +0000 (17:26 +0000)]
Merge "TextClassifier: API rename" into oc-dev
am:
093eb12994
Change-Id: Idc047d0aa3a9dea72c703d83e4caf521166d9531
Dianne Hackborn [Sun, 30 Apr 2017 17:19:29 +0000 (17:19 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services can't..." into oc-dev
TreeHugger Robot [Sun, 30 Apr 2017 17:15:44 +0000 (17:15 +0000)]
Merge "TextClassifier: API rename" into oc-dev
Bill Yi [Sun, 30 Apr 2017 16:14:26 +0000 (16:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b212441814 -s ours
Change-Id: Ia7f4b06b6f60dcb432d7303f918753ffb5f2c81c
TreeHugger Robot [Sun, 30 Apr 2017 16:08:30 +0000 (16:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Adam Lesinski [Sun, 30 Apr 2017 14:38:28 +0000 (14:38 +0000)]
Merge "AAPT2: Fix typo in manifest validation expectation" into oc-dev
am:
7cf8ca95aa
Change-Id: I58d0fd8fa128b0c8773a9fd158ae4fd9c46cd748
TreeHugger Robot [Sun, 30 Apr 2017 14:31:12 +0000 (14:31 +0000)]
Merge "AAPT2: Fix typo in manifest validation expectation" into oc-dev
Martijn Coenen [Sun, 30 Apr 2017 13:53:54 +0000 (13:53 +0000)]
Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev
am:
35312fd4c6
Change-Id: Ibab6c7a25fe9534bd1a274065b36dc7813f745e0
Martijn Coenen [Sun, 30 Apr 2017 13:47:06 +0000 (13:47 +0000)]
Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev
Rebecca Silberstein [Sun, 30 Apr 2017 09:57:24 +0000 (09:57 +0000)]
Merge "WifiManager: add APIs for LOHS" into oc-dev
am:
4bac2d2fd7
Change-Id: I5867a29fa23701eba593b6e49464adbc1267186a
Bill Yi [Sun, 30 Apr 2017 09:55:39 +0000 (09:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f1ec05297d -s ours
Change-Id: I2d1e4c8f333d8e97e154ae999bf7e1d2cfca1cac
Bill Yi [Sun, 30 Apr 2017 09:53:59 +0000 (09:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
8d9d1ae932 -s ours
Change-Id: I7dd0d63dbe81bdf253aa6a60a3c2a62082af4479
Bill Yi [Sun, 30 Apr 2017 09:51:50 +0000 (09:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f38b94a933 -s ours
Change-Id: Ieb184cb9223a86d2711c52f08bf1634ad5e2f759
Bill Yi [Sun, 30 Apr 2017 09:45:50 +0000 (09:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
5bb0b0b7e2 -s ours
Change-Id: If3a6b958fa28dfc5f6486f1d2fc5e9018562f7b5
TreeHugger Robot [Sun, 30 Apr 2017 09:43:19 +0000 (09:43 +0000)]
Merge "WifiManager: add APIs for LOHS" into oc-dev