OSDN Git Service
Robert Greenwalt [Thu, 30 Mar 2017 00:00:08 +0000 (00:00 +0000)]
Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" into oc-dev
am:
8931dc5d2f
Change-Id: I1866dd1f0f44dd6653c1d8c9618f04386a172888
Robert Greenwalt [Wed, 29 Mar 2017 23:53:17 +0000 (23:53 +0000)]
Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" into oc-dev
Chad Brubaker [Wed, 29 Mar 2017 23:33:48 +0000 (23:33 +0000)]
Merge "Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps" into oc-dev
am:
84eecd2532
Change-Id: Ib297fcfe2f6bff079a4325420bc8b62a5f29bd55
Makoto Onuki [Wed, 29 Mar 2017 23:32:54 +0000 (23:32 +0000)]
Merge "Mention <intent> can't have string resources." into oc-dev
am:
6c3e92bbe9
Change-Id: I7f4a77fd3dd98955ad4f6e88b6471d72190a3977
TreeHugger Robot [Wed, 29 Mar 2017 23:25:54 +0000 (23:25 +0000)]
Merge "Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps" into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 23:24:38 +0000 (23:24 +0000)]
Merge "Mention <intent> can't have string resources." into oc-dev
Tony Mak [Wed, 29 Mar 2017 23:21:23 +0000 (23:21 +0000)]
Merge "Whitelist ManagedProvisioning from bg check" into oc-dev
am:
fc1dd04b0b
Change-Id: I69b3c9fed0cc52b7a500f05a2ca8cd9fe3d0cc36
TreeHugger Robot [Wed, 29 Mar 2017 23:12:38 +0000 (23:12 +0000)]
Merge "Whitelist ManagedProvisioning from bg check" into oc-dev
Android Build Merger (Role) [Wed, 29 Mar 2017 22:59:08 +0000 (22:59 +0000)]
Merge "Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579 am:
25105f6561 am:
dfc1264eff" into oc-dev-plus-aosp
Pavlin Radoslavov [Wed, 29 Mar 2017 22:57:22 +0000 (22:57 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579 am:
25105f6561
am:
dfc1264eff
Change-Id: I09fd2e135ff0410b08ce197f98a4f58b14c9b7c6
Jason Monk [Wed, 29 Mar 2017 22:56:24 +0000 (22:56 +0000)]
Merge "Fix battery warning color lookup" into oc-dev
am:
834c260e98
Change-Id: Ic29ab89382f4d44e0777d3440ebbe7581a367220
Peter Qiu [Wed, 29 Mar 2017 22:55:31 +0000 (22:55 +0000)]
Merge "wifi: add test for tracking Passpoint AP on devices with Passpoint disabled" into oc-dev
am:
f1cc8b82b3
Change-Id: Id1e32596121a5aef347d6e9bc4c2402a22acc207
Pavlin Radoslavov [Wed, 29 Mar 2017 22:51:41 +0000 (22:51 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579
am:
25105f6561
Change-Id: I67601df54e55171e3d559b71258d99ad1e0a8c5d
TreeHugger Robot [Wed, 29 Mar 2017 22:50:28 +0000 (22:50 +0000)]
Merge "Fix battery warning color lookup" into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 22:49:59 +0000 (22:49 +0000)]
Merge "wifi: add test for tracking Passpoint AP on devices with Passpoint disabled" into oc-dev
Pavlin Radoslavov [Wed, 29 Mar 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
am:
3c7fce3579
Change-Id: Ic8483107e72a61e8b07f26f343e36254fe57cfd9
Treehugger Robot [Wed, 29 Mar 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
Yifan Hong [Wed, 29 Mar 2017 22:24:52 +0000 (22:24 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." into oc-dev
am:
ee40a2652c
Change-Id: I565135074b206a3ae6f1783f4de799b57593e7c6
TreeHugger Robot [Wed, 29 Mar 2017 22:20:28 +0000 (22:20 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." into oc-dev
Phil Weaver [Wed, 29 Mar 2017 21:32:19 +0000 (21:32 +0000)]
Merge "Move displaying mag bounds into surface transation" into oc-dev
am:
6f3bc05868
Change-Id: I1240a4c21d712d1c04793897c5c50ef93edfc618
TreeHugger Robot [Wed, 29 Mar 2017 21:25:02 +0000 (21:25 +0000)]
Merge "Move displaying mag bounds into surface transation" into oc-dev
Makoto Onuki [Fri, 24 Mar 2017 19:54:56 +0000 (12:54 -0700)]
Mention <intent> can't have string resources.
Test: build
Bug
34046756
Change-Id: I761b246d6aba5df4a836af3d0b3bef8f977be5ec
Jaekyun Seok [Wed, 29 Mar 2017 20:58:12 +0000 (20:58 +0000)]
Merge "Enable static RROs by default" into oc-dev
am:
22ea35187f
Change-Id: I0a00621eb8cb54bd89c938539d8a2d7baee46833
TreeHugger Robot [Wed, 29 Mar 2017 20:48:53 +0000 (20:48 +0000)]
Merge "Enable static RROs by default" into oc-dev
Tony Mak [Wed, 29 Mar 2017 14:53:07 +0000 (15:53 +0100)]
Whitelist ManagedProvisioning from bg check
Notice that app put in this list is also exempted from doze.
Also, this only exempts us from the service restriction, but not the broadcast one.
Test: adb shell am make-uid-idle --user 0 com.android.managedprovisioning
&& adb shell am broadcast -a android.intent.action.PRE_BOOT_COMPLETED -n com.android.managedprovisioning/com.android.managedprovisioning.ota.PreBootListener
Observe there is no crash
Change-Id: Ic0a943a9b66c909a6727f9411af519a8c6cf0157
Fix:
36705375
Etan Cohen [Wed, 29 Mar 2017 20:28:54 +0000 (20:28 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" into oc-dev
am:
2ce80c839e -s ours
Change-Id: Ic63f823621d8570b08a281820b5ce82e483aca0f
Etan Cohen [Wed, 29 Mar 2017 20:22:03 +0000 (20:22 +0000)]
[AWARE] Remove Publish/Subscribe Count configuration
am:
f6d243b6be -s ours
Change-Id: I01b9ae8c2f06458ea6615abb5ce2c848675ed3f5
Etan Cohen [Wed, 29 Mar 2017 20:14:59 +0000 (20:14 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" into oc-dev
Jason Monk [Wed, 29 Mar 2017 20:09:31 +0000 (20:09 +0000)]
Merge "Make sure TileServices get onTileRemoved on reset" into oc-dev
am:
c463bed8db
Change-Id: I647f7ddf075d436c727990d16f6035dcb8adc483
Yifan Hong [Mon, 27 Mar 2017 20:02:34 +0000 (13:02 -0700)]
Add HidlSupport.java for utility methods for HIDL.
The old .equals code uses Objects.deepEquals,
which does not handle for, e.g. ArrayList<byte[]>.
Create our own recursive HidlSupport.deepEquals
and deepHashCode method to handle these edge cases.
Bug:
36454147
Test: hidl_test_java
Change-Id: I56dc48985486b561263c260cf43aa90f30d581d0
TreeHugger Robot [Wed, 29 Mar 2017 20:03:59 +0000 (20:03 +0000)]
Merge "Make sure TileServices get onTileRemoved on reset" into oc-dev
Winson Chung [Wed, 29 Mar 2017 19:56:55 +0000 (19:56 +0000)]
Merge "Removing duplicate string in Recents." into oc-dev
am:
c16142239f
Change-Id: I7274af1f1b6670478b3bb2a848e39a42ddff639b
TreeHugger Robot [Wed, 29 Mar 2017 19:51:53 +0000 (19:51 +0000)]
Merge "Removing duplicate string in Recents." into oc-dev
Winson Chung [Wed, 29 Mar 2017 19:43:53 +0000 (19:43 +0000)]
Merge "Dismiss the PiP if user changes setting while PiP is open." into oc-dev
am:
477b1b0361
Change-Id: I61139a578125ab1fdff0855b2f491667bae8acf0
TreeHugger Robot [Wed, 29 Mar 2017 19:40:53 +0000 (19:40 +0000)]
Merge "Dismiss the PiP if user changes setting while PiP is open." into oc-dev
Peter Qiu [Wed, 29 Mar 2017 19:39:32 +0000 (19:39 +0000)]
Merge "wifi: document UnsupportedOperationException for Passpoint related APIs" into oc-dev
am:
ef4b501c6d
Change-Id: I98889dda85de076a8ae326784699475a0571359e
Phil Weaver [Tue, 28 Mar 2017 15:35:38 +0000 (08:35 -0700)]
Move displaying mag bounds into surface transation
Bug:
30960346
Test: Manually enabled magnification and explored
Change-Id: Ida16979ecf0263b1c1288aa92385af29928f2d9e
(cherry picked from commit
251db070c5bc6f2859ef05e5456cc9079afc8224)
Peter Qiu [Wed, 29 Mar 2017 19:38:30 +0000 (19:38 +0000)]
Merge "wifi: update passpoint to Passpoint in comments" into oc-dev
am:
10180bb47b
Change-Id: Id54111d31f2ffa6937b1d10010f0ca49c86c4a7e
Fyodor Kupolov [Wed, 29 Mar 2017 19:36:12 +0000 (19:36 +0000)]
Merge "Only use cacheLock when it's needed" into oc-dev
am:
202dc5e18d
Change-Id: I4c0fc21b3cc7e73a2852f4baf976027d33cdf930
TreeHugger Robot [Wed, 29 Mar 2017 19:34:05 +0000 (19:34 +0000)]
Merge "wifi: document UnsupportedOperationException for Passpoint related APIs" into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 19:31:37 +0000 (19:31 +0000)]
Merge "wifi: update passpoint to Passpoint in comments" into oc-dev
Kevin Chyn [Wed, 29 Mar 2017 19:30:38 +0000 (19:30 +0000)]
Merge "Revert "finished implementation of fingerprintservice enumerate"" into oc-dev
am:
943b19ece7
Change-Id: I6c149cfe43e26d00488f79be80e2101af511f262
TreeHugger Robot [Wed, 29 Mar 2017 19:27:10 +0000 (19:27 +0000)]
Merge "Only use cacheLock when it's needed" into oc-dev
Kevin Chyn [Wed, 29 Mar 2017 19:25:08 +0000 (19:25 +0000)]
Merge "Revert "finished implementation of fingerprintservice enumerate"" into oc-dev
Abodunrinwa Toki [Wed, 29 Mar 2017 19:23:26 +0000 (19:23 +0000)]
Merge "TextClassifier: Switch model based on locale" into oc-dev
am:
dd83c2006b
Change-Id: Id27eb72e8932effb95047281f2a6f9b9d6686eda
Winson Chung [Wed, 29 Mar 2017 19:22:24 +0000 (19:22 +0000)]
Merge "Removing PiP notification channel." into oc-dev
am:
9c847fdc7e
Change-Id: I8fca9bb8ff5fa10830aabd79b012894def31abde
Jason Monk [Wed, 29 Mar 2017 19:21:36 +0000 (15:21 -0400)]
Fix battery warning color lookup
Test: visual
Change-Id: Ia3db18f27d83c079b19fc555387e1f7be8963298
Fixes:
36552063
TreeHugger Robot [Wed, 29 Mar 2017 19:17:31 +0000 (19:17 +0000)]
Merge "TextClassifier: Switch model based on locale" into oc-dev
Seigo Nonaka [Wed, 29 Mar 2017 19:16:02 +0000 (19:16 +0000)]
Merge "Do not use many FDs in FontManagerService." into oc-dev
am:
5301d9e6d3
Change-Id: I0e9a47acb6739be29293f5acad5d9dfb5e026775
TreeHugger Robot [Wed, 29 Mar 2017 19:13:07 +0000 (19:13 +0000)]
Merge "Removing PiP notification channel." into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 19:11:33 +0000 (19:11 +0000)]
Merge "Do not use many FDs in FontManagerService." into oc-dev
Koji Fukui [Wed, 29 Mar 2017 19:03:17 +0000 (19:03 +0000)]
Merge "Ignore toast request of pinning if request interval is too short" am:
1fcacf7736 am:
19e2bcd2a7
am:
ae6cfc1b07
Change-Id: I7e8aee8e4f02f3adbd41ce4f9d84cf83013451a7
Tima Vaisburd [Wed, 29 Mar 2017 18:55:54 +0000 (18:55 +0000)]
Merge "TextClassifier: add API to WebView" into oc-dev
am:
e4776416d4
Change-Id: I674152d0f3d1565e2281cb0dd2351a707efa1b52
Koji Fukui [Wed, 29 Mar 2017 18:55:37 +0000 (18:55 +0000)]
Merge "Ignore toast request of pinning if request interval is too short" am:
1fcacf7736
am:
19e2bcd2a7
Change-Id: Ic11d7a0daf867a6ad2a78ce4a150b0b2555f5706
Tima Vaisburd [Wed, 29 Mar 2017 18:50:04 +0000 (18:50 +0000)]
Merge "TextClassifier: add API to WebView" into oc-dev
Koji Fukui [Wed, 29 Mar 2017 18:49:47 +0000 (18:49 +0000)]
Merge "Ignore toast request of pinning if request interval is too short"
am:
1fcacf7736
Change-Id: I2814c128db0f9eb42d1f35236ed57e35ad6c417c
Kevin Chyn [Wed, 29 Mar 2017 18:29:37 +0000 (11:29 -0700)]
Revert "finished implementation of fingerprintservice enumerate"
This reverts commit
f8ff36c47f9f8d60cf825e6b43eb75d1eae81df5.
Test: manual
Change-Id: Ib7a887ad2b185d83174d171832cd9c3bc87939c0
Android Build Merger (Role) [Wed, 29 Mar 2017 18:45:12 +0000 (18:45 +0000)]
Merge "Merge changes I5c16c650,I3151fb6b am:
55efea25f3 am:
ad2684ca3d am:
6b29b1c256" into oc-dev-plus-aosp
Treehugger Robot [Wed, 29 Mar 2017 18:41:53 +0000 (18:41 +0000)]
Merge "Ignore toast request of pinning if request interval is too short"
Mukesh Agrawal [Wed, 29 Mar 2017 18:41:16 +0000 (18:41 +0000)]
Merge changes I5c16c650,I3151fb6b am:
55efea25f3 am:
ad2684ca3d
am:
6b29b1c256
Change-Id: I08019c46a433b5ea64a561d374df445d50400d45
Android Build Merger (Role) [Wed, 29 Mar 2017 18:40:34 +0000 (18:40 +0000)]
Merge "Merge "Bluetooth: fix comment wording" am:
6ba7c54a51 am:
eeedda1453 am:
ba2222aabb" into oc-dev-plus-aosp
Jakub Pawlowski [Wed, 29 Mar 2017 18:39:44 +0000 (18:39 +0000)]
Merge "Bluetooth: fix comment wording" am:
6ba7c54a51 am:
eeedda1453
am:
ba2222aabb
Change-Id: I6a1cbac244e5f262bfda523abd165cef20b7e7b2
Philip P. Moltmann [Wed, 29 Mar 2017 18:39:32 +0000 (18:39 +0000)]
Merge "Fix bad Java docs in View.java" into oc-dev
am:
94696c5ac5
Change-Id: If280cda4e47d42eef997a46bb83ca9e1ff31aa6a
Mukesh Agrawal [Wed, 29 Mar 2017 18:35:37 +0000 (18:35 +0000)]
Merge changes I5c16c650,I3151fb6b am:
55efea25f3
am:
ad2684ca3d
Change-Id: Ia0d1205b09b4770a4df46604d947c7be7aca8fb5
Jakub Pawlowski [Wed, 29 Mar 2017 18:34:40 +0000 (18:34 +0000)]
Merge "Bluetooth: fix comment wording" am:
6ba7c54a51
am:
eeedda1453
Change-Id: Ib0cdcf77d471c814651a157fc79c818f99923250
Tianjie Xu [Wed, 29 Mar 2017 18:34:14 +0000 (18:34 +0000)]
Merge "Report the temperature during an OTA update" am:
47c7e7f41a am:
022682a721
am:
998c554463
Change-Id: I12a0f4c5fb768bdaa3a4baa4fa5bd7964b80110e
TreeHugger Robot [Wed, 29 Mar 2017 18:33:07 +0000 (18:33 +0000)]
Merge "Fix bad Java docs in View.java" into oc-dev
Robert Greenwalt [Fri, 24 Mar 2017 18:55:47 +0000 (11:55 -0700)]
Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS
The name is not allowed for an internal, non-public
intent. Changed to use com.android.internal.* namespace.
bug:
35266833
Test: Ran cts.IntentTest.shouldNotFindUnexpectedIntents
Change-Id: Ifd7d7f0aa537bfbbc7d67aa3b73b0887acd6104a
Tianjie Xu [Wed, 29 Mar 2017 18:30:05 +0000 (18:30 +0000)]
Merge "Report the temperature during an OTA update" am:
47c7e7f41a
am:
022682a721
Change-Id: Idb0514f5c83232c0e66b90cc7cd40d026d1cceb0
Mukesh Agrawal [Wed, 29 Mar 2017 18:30:00 +0000 (18:30 +0000)]
Merge changes I5c16c650,I3151fb6b
am:
55efea25f3
Change-Id: Ifaaae29780d905ffe9f82645d6d17dad478ba6a9
Jakub Pawlowski [Wed, 29 Mar 2017 18:28:44 +0000 (18:28 +0000)]
Merge "Bluetooth: fix comment wording"
am:
6ba7c54a51
Change-Id: I745973b35e5d756072bff1d0958470dc0f55f6ca
Tianjie Xu [Wed, 29 Mar 2017 18:25:11 +0000 (18:25 +0000)]
Merge "Report the temperature during an OTA update"
am:
47c7e7f41a
Change-Id: I3238939bd9535571de1532f34ca137eb3fec9dc2
Winson Chung [Wed, 29 Mar 2017 18:24:02 +0000 (18:24 +0000)]
Merge "Prevent invisible PiP menu activity from having touch focus." into oc-dev
am:
bd0fdb19fd
Change-Id: I58c3b9a2d90028b0fae8064b10b82f0822482b98
Mukesh Agrawal [Wed, 29 Mar 2017 18:20:35 +0000 (18:20 +0000)]
Merge changes I5c16c650,I3151fb6b
* changes:
StateMachine: make toString() terser
utiltests: add script to run tests
Treehugger Robot [Wed, 29 Mar 2017 18:20:22 +0000 (18:20 +0000)]
Merge "Bluetooth: fix comment wording"
Winson Chung [Wed, 29 Mar 2017 18:18:08 +0000 (18:18 +0000)]
Merge "Prevent invisible PiP menu activity from having touch focus." into oc-dev
Tianjie Xu [Wed, 29 Mar 2017 18:16:44 +0000 (18:16 +0000)]
Merge "Report the temperature during an OTA update"
Philip P. Moltmann [Wed, 29 Mar 2017 18:05:43 +0000 (18:05 +0000)]
Merge "Do not allow printing until preview is updated" into oc-dev
am:
fb1e49a5c4
Change-Id: I5a2ccb79c8ca87c5eae31cc51ec2d45354cc1c2a
TreeHugger Robot [Wed, 29 Mar 2017 17:58:55 +0000 (17:58 +0000)]
Merge "Do not allow printing until preview is updated" into oc-dev
Pavlin Radoslavov [Fri, 24 Feb 2017 18:19:14 +0000 (10:19 -0800)]
Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).
Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug:
35873828
Change-Id: Ia82036ac33590a3a402b1f5a36102264d47a9029
Phil Weaver [Wed, 29 Mar 2017 17:55:19 +0000 (17:55 +0000)]
Merge "Fix problem with ListView accessibility focus" into oc-dev
am:
36bceefafa
Change-Id: I868f3d17778d00a2a45cb95694e45fcf857942e4
Jean-Michel Trivi [Wed, 29 Mar 2017 17:48:23 +0000 (17:48 +0000)]
Merge "AudioAttributes: make getVolumeControlStream() non static" into oc-dev
am:
bf6b4efa6d
Change-Id: I8b53195f226757907631bd0b709d698624613734
TreeHugger Robot [Wed, 29 Mar 2017 17:47:08 +0000 (17:47 +0000)]
Merge "Fix problem with ListView accessibility focus" into oc-dev
Doris Ling [Wed, 29 Mar 2017 17:40:45 +0000 (17:40 +0000)]
Merge "Reserve space for preference icon." into oc-dev
am:
ddb280b1ac
Change-Id: I18d2e90badb48f972dd6fd627c890062a2887324
TreeHugger Robot [Wed, 29 Mar 2017 17:39:57 +0000 (17:39 +0000)]
Merge "AudioAttributes: make getVolumeControlStream() non static" into oc-dev
Etan Cohen [Wed, 29 Mar 2017 17:39:04 +0000 (17:39 +0000)]
Merge "[AWARE] Fix unit tests" into oc-dev
am:
6fd057cf58 -s ours
Change-Id: I01ae199e6cc506fbc358bac796c0d59fb47e9998
TreeHugger Robot [Wed, 29 Mar 2017 17:34:03 +0000 (17:34 +0000)]
Merge "Reserve space for preference icon." into oc-dev
Etan Cohen [Wed, 29 Mar 2017 17:32:13 +0000 (17:32 +0000)]
Merge "[AWARE] Fix unit tests" into oc-dev
Peter Qiu [Wed, 22 Mar 2017 01:42:55 +0000 (18:42 -0700)]
wifi: update passpoint to Passpoint in comments
Per API Council, we should use the trademark name Passpoint
instead of passpoint in the code comments.
Bug:
35854283
Test: make -j32
Change-Id: Iea6697191a936d1d779c0ea50cd19c134bc7df02
Winson Chung [Thu, 23 Mar 2017 22:17:01 +0000 (15:17 -0700)]
Prevent invisible PiP menu activity from having touch focus.
- Mark the decor view as invisible when the the PiP menu activity is
hidden. We don't call Activity.setVisible() as that alters other
internal states that affect the system's understanding of whether
the activity will draw or not.
Bug:
36225602
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I6b1ed7098e1f0ff427f0655c45e566ca60979623
(cherry picked from commit
8c8ba19e0d3214f28dccec91549df9c3cd64ae10)
Winson Chung [Wed, 29 Mar 2017 04:03:52 +0000 (21:03 -0700)]
Dismiss the PiP if user changes setting while PiP is open.
Bug:
36070720
Test: Open PiP, launch setting, disable PiP for package
Change-Id: Ia193b079d6ae27fc5fb5b1e8950cf42dfdd28450
Fyodor Kupolov [Wed, 29 Mar 2017 02:11:17 +0000 (19:11 -0700)]
Only use cacheLock when it's needed
When reading from cache, we can avoid synchronization on dbLock if we
only read from cache (no db access).
When doing updates to db and cache, we should hold cacheLock only when
updating the cache.
This change improves locking in the following methods:
- getAccountVisibilityFromCache
- saveAuthTokenToDatabase
- getAccountsFromCacheLocked no longer allows outside locking. The
method was renamed to getAccountsFromCache and now self-manages locks
- writeAuthTokenIntoCacheLocked
- readAuthTokenInternal
Test: AccountManagerServiceTest
Bug:
36485175
Bug:
35262596
Change-Id: I9aca45c31716c4f0e0fd9f07859e88a7f5ba6922
Peter Qiu [Mon, 27 Mar 2017 22:19:22 +0000 (15:19 -0700)]
wifi: document UnsupportedOperationException for Passpoint related APIs
An UnsupportedOperationException will be thrown for Passpoint related
API calls if Passpoint is not enabled on the device (build config
config_wifi_hotspot2_enabled is set to false).
Bug: None
Test: None
Change-Id: Id0ba1f7b80091d55a839fa3eee36baf9b45b7f5f
Etan Cohen [Wed, 29 Mar 2017 17:19:50 +0000 (17:19 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" am:
5d81b9d67d am:
9bc8e05da2
am:
342a27e7f7
Change-Id: I5b4d9ea932373e8dd82e846d2c31995b23329fff
Etan Cohen [Wed, 29 Mar 2017 17:14:04 +0000 (17:14 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" am:
5d81b9d67d
am:
9bc8e05da2
Change-Id: If90e1b691bff1ae6f6a13c59836ad210df38f6d6
Jason Monk [Wed, 29 Mar 2017 17:13:51 +0000 (13:13 -0400)]
Make sure TileServices get onTileRemoved on reset
Test: runtest systemui
Change-Id: Ic23eb6759f99c9cfe45ab975b3bb723dae56e0d8
Fixes:
34481238
Etan Cohen [Wed, 29 Mar 2017 17:08:51 +0000 (17:08 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration"
am:
5d81b9d67d
Change-Id: I6f7545c6665d4381cdeed03290cf928bc21aef17
Etan Cohen [Mon, 20 Mar 2017 18:33:12 +0000 (11:33 -0700)]
[AWARE] Remove Publish/Subscribe Count configuration
Simplify API: semantics of publish/subscribe count restrictions
aren't clear at the app level. They depend on DW configuration as
well as discovery session type - number of packets transmitted over
the air.
There's already an app-facing discovery session lifetime configuration -
the TTL. That has clearer semantics and is sufficient (for now).
(cherry-pick of commit
2cbaf22bba4da1b60c551112a97ccc7f2e7157fa)
Bug:
36446307
Test: unit tests and integration (sl4a) tests.
Merged-In: I9129975bd2e1a61b3d23a4b6acaae703b42216c7
Change-Id: I9129975bd2e1a61b3d23a4b6acaae703b42216c7
Etan Cohen [Wed, 29 Mar 2017 17:03:41 +0000 (17:03 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration"
Seigo Nonaka [Tue, 28 Mar 2017 02:46:51 +0000 (19:46 -0700)]
Do not use many FDs in FontManagerService.
Currently there are over 170 font files are installed in system directory.
Opening 170+ files and keep them is not unacceptable. Pass URI instead.
At the same time, this CL hides full font path from FontConfig since
/system/fonts directory will be deprecated in future.
Bug:
36660849
Test: android.text.cts.FontManagerTest passed
Change-Id: I1d216dc9c6dec702a4ce3b946bfda6dcbe12b7fe
(cherry picked from commit
455f1bfc05bf972ee4fe8cd5fa135ed232126bb7)