OSDN Git Service
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: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
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
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
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)
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
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
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 [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)
Winson Chung [Wed, 29 Mar 2017 03:42:34 +0000 (20:42 -0700)]
Removing PiP notification channel.
- Using the General channel instead.
Bug:
36670134
Test: Ensure no PiP channel in settings
Change-Id: If186a2565bb6911c6e15b25788908fd909a54287
Rob Carr [Wed, 29 Mar 2017 16:51:22 +0000 (16:51 +0000)]
Merge "SurfaceView: Make surfaceRedrawNeededAsync work with WM bypass." into oc-dev
am:
76d779374a
Change-Id: Iae347650a9ad3f8735f83eba95ae655137c2c06c
Rob Carr [Wed, 29 Mar 2017 16:44:36 +0000 (16:44 +0000)]
Merge "SurfaceView: Make surfaceRedrawNeededAsync work with WM bypass." into oc-dev
Jakub Pawlowski [Thu, 23 Mar 2017 05:53:18 +0000 (22:53 -0700)]
Bluetooth: fix comment wording
Test: manual
Bug:
30622771
Change-Id: I5a589c98553f35248b0d95d332e9f35774075b24
Philip P. Moltmann [Thu, 2 Mar 2017 21:12:36 +0000 (13:12 -0800)]
Fix bad Java docs in View.java
Test: Used intelliJ to warn about bad docs
Change-Id: Idb119aff8ce0f2370f66707bd583e2d131fb0751
(cherry picked from commit
f4946e7f1592072cade07ff62b6123f8fe7d2662)
Philip P. Moltmann [Fri, 24 Mar 2017 23:17:13 +0000 (16:17 -0700)]
Do not allow printing until preview is updated
Otherwise we might end up in the situation where we print something that
was not previewed.
This is of course bad for the user as he prints something he has not seen.
It is also bad for the print spooler as in the case the layout did not
describe the amount of pages, we do not know the number of pages available
until the update is complete.
We now allow changing of printer at any time unless printing is in final
stage. If we don't allow this the changing of printer would be blocked
until the intial document was written which might take some time.
Fixes:
36599750
Test: cts-tradefed run cts-dev -m Print
Change-Id: I93e910c02f2a770008b845028f0adf17b3d410e2
(cherry picked from commit
378cddbc41dae55e9a11faaa251b80fb90878b34)
Abodunrinwa Toki [Wed, 29 Mar 2017 00:25:23 +0000 (01:25 +0100)]
TextClassifier: Switch model based on locale
Test: cts-tradefed run cts-dev -m CtsViewTestCases -t
android.view.textclassifier.cts.TextClassificationManagerTest
Change-Id: I91f814fc47bd75922c0e42a774dc7376daf65366
Geoffrey Pitsch [Wed, 29 Mar 2017 15:41:55 +0000 (15:41 +0000)]
Merge "Re-enable throw when notifications posted can't find channel" into oc-dev
am:
1af2928767
Change-Id: I9315cb5a2fde7e238ed4f90e9608c82565f582c8
TreeHugger Robot [Wed, 29 Mar 2017 15:34:58 +0000 (15:34 +0000)]
Merge "Re-enable throw when notifications posted can't find channel" into oc-dev
Phil Weaver [Thu, 23 Mar 2017 19:21:53 +0000 (12:21 -0700)]
Fix problem with ListView accessibility focus
A scrap view was retaining accessibility focus, leading to
a confusing experience for screen reader users.
Part of the problem is that views can change even when the
adapter has stable ids. This change tightens the condition
for restoring a11y focus to the same view.
AbsListView also allowed scrap views to maintain a11y focus.
While this may make sense if the views will be reused, it is
wrong if the views are not reused.
Bug:
29403113
Test: Verified that a11y focus stays put when toggling the
preference: Settings -> System -> Language & input ->
Virtual keyboards -> Advanced -> Symbol for physical keyboard
Change-Id: Ie4a15027088f158d9ed4bb3f3eeff5a288c25832
(cherry picked from commit
ab4717aa2a7d0e19f4b08b2c851a541f9b0c9c6b)
Etan Cohen [Wed, 29 Mar 2017 15:14:30 +0000 (15:14 +0000)]
Merge "[AWARE] Fix unit tests" am:
de8e09409b am:
c24d7f781a
am:
7060ae081b
Change-Id: I7e90e4c0853457fa49335a48b20d74c3afb9ba1b
Etan Cohen [Wed, 29 Mar 2017 15:09:28 +0000 (15:09 +0000)]
Merge "[AWARE] Fix unit tests" am:
de8e09409b
am:
c24d7f781a
Change-Id: Id3901b3bec685b25297c36d19d9b23a035a00e0c
Etan Cohen [Tue, 28 Mar 2017 17:31:47 +0000 (10:31 -0700)]
[AWARE] Fix unit tests
Update to reflect new mockito semantics.
No functional change, no change to test semantics!
(cherry-pick of commit
afddcc3c9860fecfdb3ed72fafb09d73e8549411)
Bug:
36680830
Test: unit tests now passing
Merged-In: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011
Change-Id: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011
Etan Cohen [Wed, 29 Mar 2017 15:04:28 +0000 (15:04 +0000)]
Merge "[AWARE] Fix unit tests"
am:
de8e09409b
Change-Id: I563dc61839664a7b51c1fe44283f7dd18217b012
Etan Cohen [Wed, 29 Mar 2017 14:56:40 +0000 (14:56 +0000)]
Merge "[AWARE] Fix unit tests"
Diego Perez [Wed, 29 Mar 2017 13:31:15 +0000 (13:31 +0000)]
Merge "Add audio service support to BridgeContext" into oc-dev
am:
92b3242827
Change-Id: If398e8b30b96e5e9ba815076638c1d96878ee60d
TreeHugger Robot [Wed, 29 Mar 2017 13:26:21 +0000 (13:26 +0000)]
Merge "Add audio service support to BridgeContext" into oc-dev
Geoffrey Pitsch [Wed, 29 Mar 2017 13:19:50 +0000 (09:19 -0400)]
Re-enable throw when notifications posted can't find channel
Only applies for non-user builds, and for apps that have tried using
channels.
Test: runtest systemui-notification
Change-Id: I7e28545ba28eadae75bf015bdf490093223e2940
Tony Mak [Wed, 29 Mar 2017 12:14:40 +0000 (12:14 +0000)]
Introduce AMS.getLastResumedActivityUserId to fix work profile icon issue
am:
ec319aba34
Change-Id: I41eb1a9f2e3dd97b5318c3dee92c73e4d531966b
Diego Perez [Wed, 29 Mar 2017 11:03:58 +0000 (12:03 +0100)]
Add audio service support to BridgeContext
Bug: http://b.android.com/259326
Test: N/A
Change-Id: Ie43ccca49a5e77d82426b4f265e3c05dddfacad9
Tony Mak [Tue, 28 Mar 2017 17:50:01 +0000 (18:50 +0100)]
Introduce AMS.getLastResumedActivityUserId to fix work profile icon issue
Problem:
Work profile status bar icon feeature is relied on two callbacks
1. onForegroundProfileSwitch (AMS.setResumedActivityLocked)
2. appTransitionStarting (WMS)
We assume callback 1 is always called before 2, but it is not the case.
These two callbacks are triggered by two handlers in two different threads,
and hence race condition happens.
Solution:
Not rely on onForegroundProfileSwitch to update mManagedProfileFocused
flag anymore. Query getLastResumedActivityUserId in appTransitionStarting.
Also, make sure mLastResumedActivity is updated before sending message
to WMS in setResumedActivityLocked.
Test: Start a work app, observe that the work icon is shown.
Test: Start a personal app, observe that work icon is gone.
Test: Dock the work app, tap on it (give it focus), observe that work
icon is shown.
Test: Start a work app, switch user, can see the icon is gone. Switch back,
icon is back.
Bug:
34159089
Change-Id: I2cee141d18e8b7d5607b26dd7a2fd5bc9cd0ebb3
Daichi Hirono [Wed, 29 Mar 2017 04:49:43 +0000 (04:49 +0000)]
Merge "Allow apps to process ProxyFDCallback asynchrnously." into oc-dev
am:
76c32a35a9
Change-Id: I9e17751f706f9e0869eefafb77bf1704335f5116
Stephen Chen [Wed, 29 Mar 2017 04:43:39 +0000 (04:43 +0000)]
Merge "Change string connected_via_network_scorer_default." into oc-dev
am:
3938580b86
Change-Id: If62e361cd59a8bb64bfdf585bbc50a7f4df640bd
TreeHugger Robot [Wed, 29 Mar 2017 04:41:38 +0000 (04:41 +0000)]
Merge "Allow apps to process ProxyFDCallback asynchrnously." into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 04:37:07 +0000 (04:37 +0000)]
Merge "Change string connected_via_network_scorer_default." into oc-dev
Koji Fukui [Thu, 6 Oct 2016 14:00:00 +0000 (23:00 +0900)]
Ignore toast request of pinning if request interval is too short
Symptom:
System crash happens if an application repeatedly requests to finish
itself in pinning state.
Root cause:
Toast for pinning state is shown when the application requests to
finish itself. Every toasts use file descripters and they consumes all
available file descripters. System crash happens because of file
descriptor shortage.
Solution:
Ignore toast request for pinning state if request interval is too short.
Bug:
34211454
Change-Id: I4c3b45825270ab96fcfb24723195e9189709c2ec
Jeff Tinker [Wed, 29 Mar 2017 01:49:06 +0000 (01:49 +0000)]
Revert "Make public getFragments() and onGetLayoutInflater() methods"
am:
79a973f643
Change-Id: Ibd6a0b5ddac4b28aec4ed038e04d86c79264bdbc
Calin Juravle [Wed, 29 Mar 2017 01:36:16 +0000 (01:36 +0000)]
Merge changes from topic 'dex' am:
f665781c74 am:
8a4afd3dad
am:
5949d0dcdc -s ours
Change-Id: Ic85e62a9ad2a7c1bd04a70776ebeb816a67a4e72
Calin Juravle [Wed, 29 Mar 2017 01:32:10 +0000 (01:32 +0000)]
Merge changes from topic 'dex' am:
f665781c74
am:
8a4afd3dad
Change-Id: Ieb7d998721404040c0d2be010896a5dd15a3458c
Calin Juravle [Wed, 29 Mar 2017 01:27:37 +0000 (01:27 +0000)]
Merge changes from topic 'dex'
am:
f665781c74
Change-Id: I31c202a56d8f92634cc1d5d84106e27cb8c23bfd
Jeff Tinker [Wed, 29 Mar 2017 01:10:54 +0000 (01:10 +0000)]
Revert "Make public getFragments() and onGetLayoutInflater() methods"
This reverts commit
599be3d01ed1811ae365085e67a15d082170b583.
This change is being reverted because it broke git_master build.
Change-Id: I54ab9cd3d9e08dcf870f472fda08cc44e57986d0
bug:
34703669
mukesh agrawal [Tue, 28 Mar 2017 03:26:38 +0000 (20:26 -0700)]
StateMachine: make toString() terser
The current implementation of the toString()
method calls dump(). This causes two problems:
1. toString() may return a large string. This
is at odds with the advice in the documentation
for Object.toString(), which says that the
returned String should be concise, and easy
to read.
2. The dump() method is overriden by many of the
StateMachine subclasses. Some of those subclasses
have dump() implementations that are expensive,
and/or have dependencies on other objects.
To resolve these problems, we simpify
StateMachine.toString().
Along the way: remove a stale comment about
implementing dump() using toString().
Note: only ran the StateMachine tests, since some
other tests are already failing.
Bug:
36661851
Test: tests/utiltests/runtests.sh \
-e class com.android.internal.util.StateMachineTest
Change-Id: I5c16c650f01178c4d018b6a65e4aa95fb905aff6
mukesh agrawal [Wed, 29 Mar 2017 01:19:49 +0000 (18:19 -0700)]
utiltests: add script to run tests
Make it easier to run the tests, so that more people
will run them.
Bug:
36698401
Test: tests/utiltests/runtests.sh \
-e class com.android.internal.util.StateMachineTest
Change-Id: I3151fb6b2f609f45c7d8154b51f13cce58ccdc13
Calin Juravle [Wed, 29 Mar 2017 01:19:57 +0000 (01:19 +0000)]
Merge changes from topic 'dex'
* changes:
Compile secondary dex files according to REASON_BACKGROUND_DEXOPT
Register secondary dex files for JIT profiling
Move DexLoadReporter out of LoadedApk
Set pm.BackgroundDexOptService as the source of true
Add missing return in DexManager
Update package use info when the app data is updated
Stephen Chen [Wed, 29 Mar 2017 01:14:17 +0000 (18:14 -0700)]
Change string connected_via_network_scorer_default.
Bug:
36629448
Test: make
Change-Id: I06945a64b54d7e41c542ec36ef45eb7c8cb7bf10
Casey Burkhardt [Wed, 29 Mar 2017 01:14:05 +0000 (01:14 +0000)]
Merge "Ensures Accessibility button always overrides IME switcher" into oc-dev
am:
684607f7f6
Change-Id: I34b40003f5336c68bb6725ba8cc8023495f1f4bf
Casey Burkhardt [Wed, 29 Mar 2017 01:05:33 +0000 (01:05 +0000)]
Merge "Ensures Accessibility button always overrides IME switcher" into oc-dev
Conrad Chen [Wed, 29 Mar 2017 00:50:18 +0000 (00:50 +0000)]
Merge "TIF: open transient columns to public" into oc-dev
am:
438be2af18
Change-Id: Ib96f324a3a04d1bce97f64c3d99a524ee9a353d1
Android Build Merger (Role) [Wed, 29 Mar 2017 00:49:00 +0000 (00:49 +0000)]
Merge "Merge "Add HidlSupport.java for utility methods for HIDL." am:
383391c5da am:
75172f2909 am:
2b38993bef" into oc-dev-plus-aosp
Yifan Hong [Wed, 29 Mar 2017 00:48:01 +0000 (00:48 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." am:
383391c5da am:
75172f2909
am:
2b38993bef
Change-Id: Ieda97ba519f5dc35efa54ae4457737df585b8dc2
Ammar Aijazi [Wed, 29 Mar 2017 00:46:34 +0000 (00:46 +0000)]
Merge "NetworkPolicy gets updated due to CarrierConfigManager updates." into oc-dev
am:
334220984e
Change-Id: I48d20978f1382f0c053ffd83ad772fa4b6b5cf1a
Conrad Chen [Wed, 29 Mar 2017 00:46:04 +0000 (00:46 +0000)]
Merge "TIF: open transient columns to public" into oc-dev
Yifan Hong [Wed, 29 Mar 2017 00:44:01 +0000 (00:44 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." am:
383391c5da
am:
75172f2909
Change-Id: I173a10744b83e144c19d5fc9167cac40d07aef92
TreeHugger Robot [Wed, 29 Mar 2017 00:42:21 +0000 (00:42 +0000)]
Merge "NetworkPolicy gets updated due to CarrierConfigManager updates." into oc-dev
Yifan Hong [Wed, 29 Mar 2017 00:39:58 +0000 (00:39 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL."
am:
383391c5da
Change-Id: If68b94a2b38a7665a739f2792b8e0acefe5037c1