OSDN Git Service
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
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: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
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
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
TreeHugger Robot [Sun, 30 Apr 2017 09:40:24 +0000 (09:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Sun, 30 Apr 2017 09:37:42 +0000 (09:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
c0c868e359 -s ours
Change-Id: Ib299c3c68c917bc1007ad4442a099b51451c3887
Bill Yi [Sun, 30 Apr 2017 09:35:51 +0000 (09:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b9b01f5745 -s ours
Change-Id: If172f04e68b9821171e2719be3f61d5f7dbd9f4c
TreeHugger Robot [Sun, 30 Apr 2017 09:35:07 +0000 (09:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sun, 30 Apr 2017 09:31:52 +0000 (09:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sun, 30 Apr 2017 09:28:47 +0000 (09:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sun, 30 Apr 2017 09:24:26 +0000 (09:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Sun, 30 Apr 2017 09:24:15 +0000 (09:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
5957e13822 -s ours
Change-Id: Ia70fef566e22ef708c54f0eb32d1ef3103984ceb
TreeHugger Robot [Sun, 30 Apr 2017 09:23:33 +0000 (09:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Sun, 30 Apr 2017 09:22:30 +0000 (09:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
572e338a4c -s ours
Change-Id: Iacd88103d7223c8d4495ff9fff2c5773e2e67cc2
TreeHugger Robot [Sun, 30 Apr 2017 09:17:43 +0000 (09:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sun, 30 Apr 2017 09:16:27 +0000 (09:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Rebecca Silberstein [Fri, 28 Apr 2017 20:28:12 +0000 (13:28 -0700)]
WifiManager: expose Local Only Hotspot APIs
Expose the APIs to start and stop LocalOnlyHotspot.
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: I8d149ab04d24bf0eb54dd8d8a62e285f9c5b483e
Rebecca Silberstein [Thu, 27 Apr 2017 20:57:19 +0000 (13:57 -0700)]
WifiManager: implement watch LocalOnlyHotspot
Implement new calls to watchLocalOnlyHotspot and
unregisterLocalOnlyHotspotObserver along with the classes
LocalOnlyHotspotObserver and LocalOnlyHotspotSubscription.
Added tests for watching LOHS and cancelling a LOHS subscription.
The calls will be exposed in a later CL.
Bug:
36704763
Test: compiles
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ia0a528191ae0897742304d8b61e9779ad721a450
Rebecca Silberstein [Sat, 25 Mar 2017 19:40:29 +0000 (12:40 -0700)]
WifiManager: implement start/stopLocalOnlyHotspot
Implement new calls to startLocalOnlyHotspot and
cancelLocalOnlyHotspotRequest along with the classes
LocalOnlyHotspotCallback and LocalOnlyHotspotReservation.
Added tests for starting LOHS and cancelling a LOHS request.
The calls will be exposed in a later CL.
Bug:
36704763
Test: compiles
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: If54a89cb8dfd235bc18ef3e6c89f9d30882136a3
Rebecca Silberstein [Thu, 27 Apr 2017 05:02:30 +0000 (22:02 -0700)]
WifiManager: add LocalOnlyHotspotObserverProxy
Add the proxy for LOHS observer callbacks to make sure we give updates
to calling apps on the correct thread.
This will be used in a follow-on CL.
Bug:
36704763
Test: mmma -j64 frameworks/base/
Change-Id: I20faa73325116426f45d9d8fabc45b279bd5a286
Rebecca Silberstein [Thu, 27 Apr 2017 04:50:04 +0000 (21:50 -0700)]
WifiManager: add LocalOnlyHotspotCallbackProxy
Add the proxy for LOHS callbacks to make sure we give updates to calling
apps on the correct thread.
This will be used in a follow-on CL.
Bug:
36704763
Test: mmma -j64 frameworks/base/
Change-Id: Ib32dfd232ff8aaeb5f7b228cf0cfc3fd23fd7ee4
Rebecca Silberstein [Wed, 26 Apr 2017 23:11:52 +0000 (16:11 -0700)]
WifiManager: add APIs for LOHS
Add the APIs and docs for LocalOnlyHotspot (LOHS). The calls are
not implemented with this CL.
Bug:
36704763
Bug:
37073685
Test: make
Change-Id: Ib7ab287a65091f54abef56feebb4cccd1e15a173
Clara Bayarri [Sun, 30 Apr 2017 06:55:55 +0000 (06:55 +0000)]
Merge "Restricted Context layout font loading in TextView" into oc-dev
am:
7f90a9fdb0
Change-Id: I32a8e9e627e0b78b22c87b11483e744486e16944
TreeHugger Robot [Sun, 30 Apr 2017 06:50:36 +0000 (06:50 +0000)]
Merge "Restricted Context layout font loading in TextView" into oc-dev
Svet Ganov [Sun, 30 Apr 2017 06:49:57 +0000 (06:49 +0000)]
Merge "Address API council comments" into oc-dev
am:
4c60abc9ae
Change-Id: Ibe0d780b116529e285e9dedd4a5f3ef62c54ccd2
TreeHugger Robot [Sun, 30 Apr 2017 06:43:07 +0000 (06:43 +0000)]
Merge "Address API council comments" into oc-dev
Sundeep Ghuman [Sun, 30 Apr 2017 04:59:19 +0000 (04:59 +0000)]
Merge "Don't show unset values in AccessPoint toString." into oc-dev
am:
606c05396d
Change-Id: Ie031883b24a4b8342253efaa34e1ec8ecdaa2a04
TreeHugger Robot [Sun, 30 Apr 2017 04:53:13 +0000 (04:53 +0000)]
Merge "Don't show unset values in AccessPoint toString." into oc-dev
Erik Kline [Sun, 30 Apr 2017 04:39:16 +0000 (04:39 +0000)]
Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" into oc-dev
am:
d0e65f5ef0
Change-Id: I531d5f5964a1212af5842e682bb95d9ee01a6360
TreeHugger Robot [Sun, 30 Apr 2017 04:32:35 +0000 (04:32 +0000)]
Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" into oc-dev
Dianne Hackborn [Wed, 26 Apr 2017 20:59:47 +0000 (13:59 -0700)]
Work on issue #
36891897: Need to ensure foreground services can't...
...hide themselves
The activity manager now keeps track of all apps that are running
foreground services and builds a notification showing them to the
user. We ensure they are shown to the user for at least 30 seconds
(configurable). If foreground services are executed while the
screen is off, their apps will be shown to the user for at least
30 seconds after the screen turns back on.
While doing this I am also adding a new process state to distinguish
between "important background" stuff that should bypass bg check vs.
ones that don't. By default, these now no longer bypass bg check,
which is really the expected (and documented) behavior. There is a
new bind flag to allow them to bypass bg check, which is currently
only used by the IME.
Also add some new job scheduler commands that will be used to
write new tests cases for jobs timing out.
Bug:
36891897
Test: manual
Change-Id: Ied3f7b56444254513fd776f06b88bc0e54704958
Ajay Panicker [Tue, 18 Apr 2017 03:42:22 +0000 (20:42 -0700)]
Limit btsnoop file size (3/8)
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.
Bug:
35998031
Test: Enable snoop logs from developer options and let logs get large
Change-Id: I40d5da4c1b1c9b45908e5790d130f1c5e804c773
(cherry picked from commit
00e82f235cb15d742eb7a25a81f0323b1b6408cf)
Abodunrinwa Toki [Fri, 28 Apr 2017 18:59:57 +0000 (19:59 +0100)]
TextClassifier: API rename
getTextClassificationResult() -> classifyText()
TextClassificationResult -> TextClassification
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug:
37769880
Change-Id: I2d926e89058babf06bcff390bee3a45e965984e8
Selim Cinek [Sat, 29 Apr 2017 23:14:26 +0000 (23:14 +0000)]
Merge "Fixed an issue where notifications wouldn't have a channel" into oc-dev
am:
34c226d602
Change-Id: I188cf60bc893aa14869a84f5e699298faaf61469
TreeHugger Robot [Sat, 29 Apr 2017 23:09:36 +0000 (23:09 +0000)]
Merge "Fixed an issue where notifications wouldn't have a channel" into oc-dev
Winson Chung [Sat, 29 Apr 2017 22:44:51 +0000 (22:44 +0000)]
Merge "Fixing test due to null PiP default bounds." into oc-dev
am:
0152fd3686
Change-Id: Id14fa9d368f1c121f36ab3b20f0183a8cc5a8934
Yipeng Cao [Sat, 29 Apr 2017 22:42:25 +0000 (22:42 +0000)]
Merge "Fixed the hasCarrierFrequency flag in GnssStatus (part1)" into oc-dev
am:
80e1b2fc56
Change-Id: I9cff443fbb5009d3bb20d9050cd5980dc7c0b17f
TreeHugger Robot [Sat, 29 Apr 2017 22:36:56 +0000 (22:36 +0000)]
Merge "Fixing test due to null PiP default bounds." into oc-dev
Yipeng Cao [Sat, 29 Apr 2017 22:34:55 +0000 (22:34 +0000)]
Merge "Fixed the hasCarrierFrequency flag in GnssStatus (part1)" into oc-dev
Adam Lesinski [Sat, 29 Apr 2017 21:44:54 +0000 (21:44 +0000)]
Merge "AAPT2: binary parser should be more lenient with files" into oc-dev
am:
557a0c50a0
Change-Id: Ief1b27016f7a8555611d1c828d1e71722370ce92
TreeHugger Robot [Sat, 29 Apr 2017 21:39:26 +0000 (21:39 +0000)]
Merge "AAPT2: binary parser should be more lenient with files" into oc-dev
Adam Lesinski [Sat, 29 Apr 2017 21:08:47 +0000 (21:08 +0000)]
Merge "AAPT2: Fix string escaping" into oc-dev
am:
f6bc1402ed
Change-Id: I31f0c21dcf391384759e71112957ccdc281965d3
TreeHugger Robot [Sat, 29 Apr 2017 21:04:34 +0000 (21:04 +0000)]
Merge "AAPT2: Fix string escaping" into oc-dev
Adam Lesinski [Sat, 29 Apr 2017 20:44:17 +0000 (20:44 +0000)]
Merge changes I446fb6ab,Ife3bbd29 into oc-dev
am:
53c9898e79
Change-Id: Ie8ae301856c5734eef2fc919116944ef2e741aa9
TreeHugger Robot [Sat, 29 Apr 2017 20:38:15 +0000 (20:38 +0000)]
Merge changes I446fb6ab,Ife3bbd29 into oc-dev
* changes:
Valid resource IDs may be negative
AAPT2: Workaround for findViewById with package ID > 0x7f
Esteban Talavera [Sat, 29 Apr 2017 19:55:13 +0000 (19:55 +0000)]
Merge "Add managed profile whitelist to control NotificationListenerServices" into oc-dev
am:
5bb8294f92
Change-Id: I78a9d01c4e91cfbf8d6703d1c2c15590d0d72fa4
TreeHugger Robot [Sat, 29 Apr 2017 19:49:31 +0000 (19:49 +0000)]
Merge "Add managed profile whitelist to control NotificationListenerServices" into oc-dev
Bill Yi [Sat, 29 Apr 2017 18:22:29 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d95344d8aa -s ours
Change-Id: I0b97a8efe7a09d1b37d756a43efa4af083120d67
Bill Yi [Sat, 29 Apr 2017 18:16:11 +0000 (11:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie2537dfd9a1079cb527dbb306f6d62c32a4094fd
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 29 Apr 2017 18:14:53 +0000 (18:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Sat, 29 Apr 2017 18:11:22 +0000 (11:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a097c492fa434b7b78a62bf639c262154fcdd52
Auto-generated-cl: translation import
Jeff Sharkey [Sat, 29 Apr 2017 17:48:28 +0000 (17:48 +0000)]
Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev
am:
e14159d2c5
Change-Id: Ia51f9f817a7792c5b4e63ad5af532ebd59cff95f
Jeff Sharkey [Sat, 29 Apr 2017 17:42:42 +0000 (17:42 +0000)]
Merge "Experimental features only on debuggable builds." into oc-dev
am:
d9f6946c42
Change-Id: I3d6228116545661eb30d997d8f7137f168adc79e
Jeff Sharkey [Sat, 29 Apr 2017 17:38:53 +0000 (17:38 +0000)]
Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev
Jeff Sharkey [Sat, 29 Apr 2017 17:33:54 +0000 (17:33 +0000)]
Merge "Experimental features only on debuggable builds." into oc-dev
Jeff Sharkey [Sat, 29 Apr 2017 17:22:04 +0000 (17:22 +0000)]
Merge "API fixes for Companion renaming" into oc-dev
am:
0a482bda21
Change-Id: Ieae01b365a956afb48531a16adf3051e1624255d
Jeff Sharkey [Sat, 29 Apr 2017 17:15:12 +0000 (17:15 +0000)]
Merge "Rename Companion permissions" into oc-dev
am:
48c0dc6c4b
Change-Id: Ia52e6c6347969612dc1d4baf036fd696ac568c58
Jeff Sharkey [Sat, 29 Apr 2017 17:11:35 +0000 (17:11 +0000)]
Merge "API fixes for Companion renaming" into oc-dev
Jeff Sharkey [Sat, 29 Apr 2017 17:04:42 +0000 (17:04 +0000)]
Merge "Rename Companion permissions" into oc-dev
Bill Yi [Sat, 29 Apr 2017 17:01:47 +0000 (10:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia06f4c8f73b012dbfd17c0681ea17d7eaa2c3137
Auto-generated-cl: translation import
Bill Yi [Sat, 29 Apr 2017 16:58:01 +0000 (09:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id1cf0436e966c1ae73301b64c1e479f55abd078b
Auto-generated-cl: translation import
Jeff Sharkey [Sat, 29 Apr 2017 16:44:11 +0000 (16:44 +0000)]
Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev
am:
408ec0b463
Change-Id: I9d013dec3bffac03ddebbd5689f20f94d5d5f96d
Bill Yi [Sat, 29 Apr 2017 16:41:24 +0000 (09:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I67b11b17a2400e4330f1c1d501bf73375fcfa538
Auto-generated-cl: translation import
Jeff Sharkey [Sat, 29 Apr 2017 16:39:32 +0000 (16:39 +0000)]
Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev
Makoto Onuki [Sat, 29 Apr 2017 16:25:22 +0000 (16:25 +0000)]
Merge "bringDownServiceLocked() shouldn't complain when mServicesByName..." into oc-dev
am:
1f1d372524
Change-Id: Ide5cfde6d0f8982c0fa51f6f8e10f1ce7a65389e
Bill Yi [Sat, 29 Apr 2017 16:25:03 +0000 (09:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iafadab9c947745e67c3a904cc0720860952c88ea
Auto-generated-cl: translation import
Makoto Onuki [Sat, 29 Apr 2017 16:19:39 +0000 (16:19 +0000)]
Merge "bringDownServiceLocked() shouldn't complain when mServicesByName..." into oc-dev