OSDN Git Service
Todd Kennedy [Fri, 5 May 2017 14:27:55 +0000 (14:27 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev
am:
d55670bcf5
Change-Id: Ia0fe6ae25879711ae0c9cf92a71607a5d7c5f4dc
TreeHugger Robot [Fri, 5 May 2017 14:20:47 +0000 (14:20 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev
Bryce Lee [Fri, 5 May 2017 14:14:12 +0000 (14:14 +0000)]
Merge "Finish noHistory activities immediately after resumed activity shown." into oc-dev
am:
c589f1b1f7
Change-Id: I69284fa04066ef823a1420df733a1938be3961a7
Bryce Lee [Fri, 5 May 2017 14:08:21 +0000 (14:08 +0000)]
Merge "Finish noHistory activities immediately after resumed activity shown." into oc-dev
Bill Yi [Fri, 5 May 2017 12:30:36 +0000 (12:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f996c71431 -s ours
Change-Id: I6a9d2f7b3d69c6ea5bbd60496e101f362bed07b6
Bill Yi [Fri, 5 May 2017 12:24:37 +0000 (12:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
288e7f54d0 -s ours
Change-Id: Ic0f9b8e1ab1cda9bcacd8c2db6a9cf3d909c12e8
TreeHugger Robot [Fri, 5 May 2017 12:24:02 +0000 (12:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 12:14:06 +0000 (12:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Michael Wright [Fri, 5 May 2017 12:11:16 +0000 (12:11 +0000)]
Merge "Remove line from bad resolution merge." into oc-dev-plus-aosp
Android Build Merger (Role) [Fri, 5 May 2017 12:07:26 +0000 (12:07 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
8d95e04111 -s ours" into oc-dev-plus-aosp
Bill Yi [Fri, 5 May 2017 12:06:42 +0000 (12:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
8d95e04111 -s ours
Change-Id: I4572d5501da94623679e96e4102c9ab3ac3f3982
Nicolas Geoffray [Fri, 5 May 2017 12:01:15 +0000 (13:01 +0100)]
Remove line from bad resolution merge.
Test: build
Change-Id: Ie7f9187ecf63150b9ea36858e80e226c6daaa184
Bill Yi [Fri, 5 May 2017 12:00:05 +0000 (12:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
8d95e04111 -s ours
Change-Id: I2306f269edb62724a2c087e3f9509e5c938942fb
TreeHugger Robot [Fri, 5 May 2017 11:54:04 +0000 (11:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Narayan Kamath [Fri, 5 May 2017 10:59:06 +0000 (10:59 +0000)]
Merge "ActivityManagerService: Add an overall stack dumping timeout." into oc-dev
am:
e7e6ce027c
Change-Id: I3604cc1238704632b9f5061c58d2dd43f5d95a9a
TreeHugger Robot [Fri, 5 May 2017 10:56:41 +0000 (10:56 +0000)]
Merge "ActivityManagerService: Add an overall stack dumping timeout." into oc-dev
Jorim Jaggi [Fri, 5 May 2017 10:47:38 +0000 (10:47 +0000)]
Merge "Don't include IME in app screenshot" into oc-dev
am:
4b8f68fd52
Change-Id: If1d1b6a80748c479915ec020b5a97373bdcafda9
Jorim Jaggi [Fri, 5 May 2017 10:43:39 +0000 (10:43 +0000)]
Merge "Don't include IME in app screenshot" into oc-dev
Nicolas Geoffray [Fri, 5 May 2017 10:22:53 +0000 (10:22 +0000)]
Merge "resolve merge conflicts of
c2421a2a3c37 to oc-dev-plus-aosp" into oc-dev-plus-aosp
Vladislav Kuzkokov [Fri, 5 May 2017 09:40:34 +0000 (09:40 +0000)]
Merge "Store "block uninstall" flag separately from the rest of package state." into oc-dev
am:
914d4bf10f
Change-Id: Ie0f943598965c23c7ec950bf851a055b355023ff
Vladislav Kuzkokov [Fri, 5 May 2017 09:36:45 +0000 (09:36 +0000)]
Merge "Store "block uninstall" flag separately from the rest of package state." into oc-dev
Nicolas Geoffray [Fri, 5 May 2017 09:23:19 +0000 (10:23 +0100)]
resolve merge conflicts of
c2421a2a3c37 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5825e002c7ac5655703cd31d84ccc1cb5379f0e0
Dianne Hackborn [Fri, 5 May 2017 09:06:34 +0000 (09:06 +0000)]
Merge "All kinds of little foreground services fixes." into oc-dev
am:
525044e987
Change-Id: I5bd49a0e56bb5a5c08a20f38ce3801be1cb5dc1b
TreeHugger Robot [Fri, 5 May 2017 09:00:42 +0000 (09:00 +0000)]
Merge "All kinds of little foreground services fixes." into oc-dev
Nicolas Geoffray [Fri, 5 May 2017 08:53:51 +0000 (08:53 +0000)]
Merge "Handle safe mode in PackageManager." am:
a34610cebc
am:
2ea3874427
Change-Id: I18f16e094d96bd754c8ff0a8031450ce1a1ce023
Nicolas Geoffray [Fri, 5 May 2017 08:45:39 +0000 (08:45 +0000)]
Merge "Handle safe mode in PackageManager."
am:
a34610cebc
Change-Id: Iddfa0f1cee457214aa9e6b0235865f0cebac7667
Nicolas Geoffray [Fri, 5 May 2017 08:37:16 +0000 (08:37 +0000)]
Merge "Handle safe mode in PackageManager."
Nicolas Geoffray [Fri, 5 May 2017 08:16:13 +0000 (08:16 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs." into oc-dev
am:
989618a48e
Change-Id: I17b4c64bc6acb0f24a8829f02249b1617a6bbbcf
Nicolas Geoffray [Fri, 5 May 2017 08:09:06 +0000 (08:09 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs." into oc-dev
Dianne Hackborn [Thu, 4 May 2017 23:53:11 +0000 (16:53 -0700)]
All kinds of little foreground services fixes.
- Better explanations of some strings.
- Fix to use the right package when an item is pressed in
the foreground services dialog.
- Improve java docs on Service.startForeground().
Bug:
37925387
735566 lv - Android - [Source] Context unclear or missing:
Apps running in background
Bug:
37925888
735566 lv - Android - [Source] Context unclear or missing:
Tap for details on battery and data usage
Bug:
37897953
735566 gl - Android - [Source] Context unclear or missing:
LEFT_SIDE, RIGHT_SIDE
Bug:
37943079
Music is dying mid playback
Test: manual
Change-Id: Ied41932c61f59335bd18dfba3fcb13af28a0bddd
Bill Yi [Fri, 5 May 2017 05:14:51 +0000 (22:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9b5ebe94df837619db36f6d104daff7637c449b5
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 5 May 2017 05:12:05 +0000 (05:12 +0000)]
Merge "Merge "SmartTextShare: Update generic labels for assist menu item." into oc-dev am:
ba81bc9f40" into oc-dev-plus-aosp
Abodunrinwa Toki [Fri, 5 May 2017 05:11:22 +0000 (05:11 +0000)]
Merge "SmartTextShare: Update generic labels for assist menu item." into oc-dev
am:
ba81bc9f40
Change-Id: Ie9e9d961180170417529d6ca417042f9b6b251c6
Abodunrinwa Toki [Fri, 5 May 2017 05:07:24 +0000 (05:07 +0000)]
Merge "SmartTextShare: Update generic labels for assist menu item." into oc-dev
am:
ba81bc9f40
Change-Id: Id918ecbf1a4624734c5034cd5e06007f024587f7
TreeHugger Robot [Fri, 5 May 2017 05:00:42 +0000 (05:00 +0000)]
Merge "SmartTextShare: Update generic labels for assist menu item." into oc-dev
Kevin Chyn [Fri, 5 May 2017 04:40:45 +0000 (04:40 +0000)]
Merge "RemovalClient sendRemoved should check remaining instead of fingerId" into oc-dev
am:
fe22122017
Change-Id: I6e976398877585fb5a9fef26103754b13c17b7fc
Yohei Yukawa [Fri, 5 May 2017 04:35:16 +0000 (04:35 +0000)]
Merge "Avoid unnecessary ULocale.addLikelySubtags()" into oc-dev
am:
5163d541a2
Change-Id: I976fea1146283927b789e372425ff91942f48754
TreeHugger Robot [Fri, 5 May 2017 04:34:29 +0000 (04:34 +0000)]
Merge "RemovalClient sendRemoved should check remaining instead of fingerId" into oc-dev
Yohei Yukawa [Fri, 5 May 2017 04:29:07 +0000 (04:29 +0000)]
Merge "Avoid unnecessary ULocale.addLikelySubtags()" into oc-dev
Selim Cinek [Fri, 5 May 2017 03:37:43 +0000 (03:37 +0000)]
Merge changes Ie1686719,Ie6af7751 into oc-dev
am:
ba911a25bb
Change-Id: Ia133e74b14afe5b819e9e0ffed3872629d2859ec
TreeHugger Robot [Fri, 5 May 2017 03:31:52 +0000 (03:31 +0000)]
Merge changes Ie1686719,Ie6af7751 into oc-dev
* changes:
Fixed a bug where the media notification image was wrong
Improved the gradient drawing of the media notification
Jean-Michel Trivi [Fri, 5 May 2017 02:55:46 +0000 (02:55 +0000)]
Merge "Audio service: only duck started players + refactor" into oc-dev
am:
67b62f2dfa
Change-Id: I0d400c44c4e0f4fcaf7a8f7d33d23573d11ea8c3
TreeHugger Robot [Fri, 5 May 2017 02:48:25 +0000 (02:48 +0000)]
Merge "Audio service: only duck started players + refactor" into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 02:18:39 +0000 (02:18 +0000)]
Merge "Merge "Hyphenate text in CheckedTextView" into oc-dev am:
801fc5de50" into oc-dev-plus-aosp
Roozbeh Pournader [Fri, 5 May 2017 02:16:45 +0000 (02:16 +0000)]
Merge "Hyphenate text in CheckedTextView" into oc-dev
am:
801fc5de50
Change-Id: Ibf7c0e97e7c50fabbd40ab082e796777c4c4a7be
Bill Yi [Fri, 5 May 2017 02:14:00 +0000 (19:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5197115980fb305b5bbd25b15c4bffb1a7985743
Auto-generated-cl: translation import
Roozbeh Pournader [Fri, 5 May 2017 02:10:37 +0000 (02:10 +0000)]
Merge "Hyphenate text in CheckedTextView" into oc-dev
am:
801fc5de50
Change-Id: Ia9fe52b4c7ed38855ff8a2fbe236ae6494cf06c3
TreeHugger Robot [Fri, 5 May 2017 02:03:39 +0000 (02:03 +0000)]
Merge "Hyphenate text in CheckedTextView" into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 01:36:54 +0000 (01:36 +0000)]
Merge "Merge "autofill service search uri is not backed up" into oc-dev am:
919076aa2a" into oc-dev-plus-aosp
Philip P. Moltmann [Fri, 5 May 2017 01:36:07 +0000 (01:36 +0000)]
Merge "autofill service search uri is not backed up" into oc-dev
am:
919076aa2a
Change-Id: Ic3ee12972b0550b4b81302550636c4110c1ea4f1
Philip P. Moltmann [Fri, 5 May 2017 01:30:35 +0000 (01:30 +0000)]
Merge "autofill service search uri is not backed up" into oc-dev
am:
919076aa2a
Change-Id: Ifc93582b3549df369d7f22536f53edd417623b5a
Selim Cinek [Thu, 4 May 2017 23:27:28 +0000 (16:27 -0700)]
Fixed a bug where the media notification image was wrong
In RTL the gradient was being applied the wrong way.
Test: switch to RTL, play music
Change-Id: Ie1686719d56436712fd0e6c99ba2723ba53d0025
Fixes:
37996998
Selim Cinek [Wed, 3 May 2017 22:17:10 +0000 (15:17 -0700)]
Improved the gradient drawing of the media notification
Previously we were drawing with a color on top of the
image instead of fading it out. This could lead to
visible artefacts in the background.
We're now fading out the alpha in a similar manner instead.
Test: runtest systemui
Change-Id: Ie6af7751a734b8fa44279eba970e7ca5ba67a4c0
Fixes:
37950482
Android Build Merger (Role) [Fri, 5 May 2017 01:22:59 +0000 (01:22 +0000)]
Merge "Merge "Correct scope of "disabled?" check viz backup/restore decisions" into oc-dev am:
d239223cb0" into oc-dev-plus-aosp
Philip P. Moltmann [Fri, 5 May 2017 01:22:14 +0000 (01:22 +0000)]
Merge "autofill service search uri is not backed up" into oc-dev
Chris Tate [Fri, 5 May 2017 01:22:11 +0000 (01:22 +0000)]
Merge "Correct scope of "disabled?" check viz backup/restore decisions" into oc-dev
am:
d239223cb0
Change-Id: Ic7e8bb17ae800ec1eac9ba3eef5ffb70260b72ba
Android Build Merger (Role) [Fri, 5 May 2017 01:21:54 +0000 (01:21 +0000)]
Merge "Merge "Update carrier text when phone service state is changed" am:
66f685a235 am:
6b1d176936 am:
743cf38dc8" into oc-dev-plus-aosp
Adrian Roos [Fri, 5 May 2017 01:19:57 +0000 (01:19 +0000)]
Merge "Update carrier text when phone service state is changed" am:
66f685a235 am:
6b1d176936
am:
743cf38dc8
Change-Id: I9d59b0889ba99e05fc339005ae035e454b0e6509
Chris Tate [Fri, 5 May 2017 01:18:05 +0000 (01:18 +0000)]
Merge "Correct scope of "disabled?" check viz backup/restore decisions" into oc-dev
am:
d239223cb0
Change-Id: Ic679f1c8482831abc2c4e92aedeca8a1ef51a6b8
Adrian Roos [Fri, 5 May 2017 01:12:04 +0000 (01:12 +0000)]
Merge "Update carrier text when phone service state is changed" am:
66f685a235
am:
6b1d176936
Change-Id: I3c0c4fbec11780ae524278c4382cc0fe2262989f
Chris Tate [Fri, 5 May 2017 01:10:38 +0000 (01:10 +0000)]
Merge "Correct scope of "disabled?" check viz backup/restore decisions" into oc-dev
Adrian Roos [Fri, 5 May 2017 01:04:45 +0000 (01:04 +0000)]
Merge "Update carrier text when phone service state is changed"
am:
66f685a235
Change-Id: I17c065fbf56e68daa1d8909bea914f3ffdca87dd
Adrian Roos [Fri, 5 May 2017 00:50:17 +0000 (00:50 +0000)]
Merge "Update carrier text when phone service state is changed"
Aurimas Liutikas [Fri, 5 May 2017 00:50:09 +0000 (00:50 +0000)]
Merge "Avoid reflection when mocking UserManagerService" into oc-dev
am:
bd886e52b8
Change-Id: I60ec8831c730ed2eeb2092ea6d96421497dbd5e7
Amit Mahajan [Fri, 5 May 2017 00:48:00 +0000 (00:48 +0000)]
Merge "Use sim language for VZW." into oc-dev
am:
87b544c406
Change-Id: If693c1b4827b7a3ee6633565932da433627ddb21
Aurimas Liutikas [Fri, 5 May 2017 00:40:37 +0000 (00:40 +0000)]
Merge "Avoid reflection when mocking UserManagerService" into oc-dev
Amit Mahajan [Fri, 5 May 2017 00:39:30 +0000 (00:39 +0000)]
Merge "Use sim language for VZW." into oc-dev
Bill Yi [Fri, 5 May 2017 00:07:38 +0000 (17:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25d7e172be92bc7c637b272de450966b409982a6
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 4 May 2017 23:54:21 +0000 (23:54 +0000)]
Merge "Merge "Stack is visible if behind docked which is behind pinned stack (1/2)" into oc-dev am:
b2edabadee" into oc-dev-plus-aosp
Matthew Ng [Thu, 4 May 2017 23:53:31 +0000 (23:53 +0000)]
Merge "Stack is visible if behind docked which is behind pinned stack (1/2)" into oc-dev
am:
b2edabadee
Change-Id: I69da4e74362247c4168f56ce2b23e6b03a2737e6
Roozbeh Pournader [Thu, 4 May 2017 23:41:14 +0000 (16:41 -0700)]
Hyphenate text in CheckedTextView
CheckedTextView style defaults are not derived from TextView, so they
were not getting hyphenated at all. Now they are hyphenated the same
way a normal TextView is hyphenated.
Test: Manual
Bug:
37763646
Change-Id: I3d14e5a1764561cc2922eea569d124c77cb53631
Matthew Ng [Thu, 4 May 2017 23:40:58 +0000 (23:40 +0000)]
Merge "Stack is visible if behind docked which is behind pinned stack (1/2)" into oc-dev
am:
b2edabadee
Change-Id: I91abd7cfa4889adf289966024aad4d0d2460dbf0
Jean-Michel Trivi [Wed, 3 May 2017 19:16:17 +0000 (12:16 -0700)]
Audio service: only duck started players + refactor
Refactor management of list of ducked players:
DuckingManager has a list of DuckedApps, which reference
the ducked players per uid.
Only consider ducking a player when it is in STARTED state.
When a player is released, remove it from the list of ducked players.
Test: play audio in GPM while having driving directions, music ducks
Bug:
37433811
Change-Id: I038a963432c0df6c9470a3a4fb80049d55e8719c
Yohei Yukawa [Thu, 4 May 2017 23:28:18 +0000 (16:28 -0700)]
Avoid unnecessary ULocale.addLikelySubtags()
This CL gets rid of unnecessary operations from
LocaleUtils.filterByLanguage() to speed it up, especially for the case
where there is an IME that has many subtypes.
ULocale.addLikelySubtags(ULocale) is known to be slow. Given an IME
that has N IME subtypes, LocaleUtils.filterByLanguage() calls it no
less than N times even when the only one system language is selected.
This has contributed to device boot time (Bug
32343335) time and user
switching time (Bug
28750507) since Android N where IME support
started taking multi-locale into account.
With this CL, LocaleUtils.filterByLanguage() no longer calls it
for a subtype unless its language part of the locale matches one of
user-selected system locales.
The only assumption we made here is
for any Locale objects l1 and l2
TextUtils.equals(l1.getLanguage(), l2.getLanguage())
and
TextUtils.equals(ul1.getLanguage(), ul2.getLanguage())
are equivalent, where
ul1 = ULocale.addLikelySubtags(ULocale.forLocale(l1)) and
ul2 = ULocale.addLikelySubtags(ULocale.forLocale(l2))
This should be reasonable assumption, at least for locales we want to
care about for IMEs. Under this assumption there is no behavior
change at all.
Test: bit FrameworksCoreTests:com.android.internal.inputmethod.LocaleUtilsTest
Bug:
37647204
Change-Id: Ic96900fcaf3db8b7046a50b3fe6ad65aceada369
Ajay Panicker [Thu, 4 May 2017 23:22:30 +0000 (23:22 +0000)]
Merge "Limit btsnoop file size (3/9)" into oc-dev
am:
4d1fb218f4
Change-Id: I587722c6408067b45331f10a7bfbb55c53c6317f
TreeHugger Robot [Thu, 4 May 2017 23:11:11 +0000 (23:11 +0000)]
Merge "Stack is visible if behind docked which is behind pinned stack (1/2)" into oc-dev
Ajay Panicker [Thu, 4 May 2017 22:56:16 +0000 (22:56 +0000)]
Merge "Limit btsnoop file size (3/9)" into oc-dev
Makoto Onuki [Thu, 4 May 2017 21:22:17 +0000 (21:22 +0000)]
Merge "Fix frozen alarm issue" into oc-dev
am:
af4bfcdb7e
Change-Id: I2d35bfb3f2afec37ba3e26db4ca77df67ed43a7d
TreeHugger Robot [Thu, 4 May 2017 21:12:35 +0000 (21:12 +0000)]
Merge "Fix frozen alarm issue" into oc-dev
TreeHugger Robot [Thu, 4 May 2017 21:11:25 +0000 (21:11 +0000)]
Merge "Remove redundant dependencies" into oc-dev-plus-aosp
Julia Reynolds [Thu, 4 May 2017 21:06:22 +0000 (21:06 +0000)]
Merge "Do not clear recent intrusive flag if still intrusive" into oc-dev
am:
180f0174ff
Change-Id: Ia13f2ac9ddb54799778c617bed0d98cab4c24cea
Julia Reynolds [Thu, 4 May 2017 21:04:24 +0000 (21:04 +0000)]
Merge "Remove notification settings for deleted users" into oc-dev
am:
c50b731f0f
Change-Id: I73364f24c4f2b77ac5811c094f433f28c1cb4fbe
Julia Reynolds [Thu, 4 May 2017 20:55:45 +0000 (20:55 +0000)]
Merge "Do not clear recent intrusive flag if still intrusive" into oc-dev
Julia Reynolds [Thu, 4 May 2017 20:54:14 +0000 (20:54 +0000)]
Merge "Remove notification settings for deleted users" into oc-dev
Adrian Roos [Thu, 4 May 2017 19:53:24 +0000 (19:53 +0000)]
Merge "AOD: Change DozeTriggersTest to run on prox-less devices" into oc-dev
am:
07672353a5
Change-Id: Ib77d3bbd83724d763e315d8d277e19ca2d0cd7b2
Adrian Roos [Thu, 4 May 2017 19:51:11 +0000 (19:51 +0000)]
Merge "TrustManagerService: Fix service binding leak" into oc-dev
am:
b0ebbc3d2c
Change-Id: Id77bb84e049eacfe8c4a4bbd2c42c5078025811f
Adrian Roos [Thu, 4 May 2017 19:45:34 +0000 (19:45 +0000)]
Merge "AOD: Change DozeTriggersTest to run on prox-less devices" into oc-dev
Adrian Roos [Thu, 4 May 2017 19:44:37 +0000 (19:44 +0000)]
Merge "TrustManagerService: Fix service binding leak" into oc-dev
Android Build Merger (Role) [Thu, 4 May 2017 19:29:58 +0000 (19:29 +0000)]
Merge "Merge "Fix an NPE that can result from a race condition." into oc-dev am:
d8aa2acea3" into oc-dev-plus-aosp
Sundeep Ghuman [Thu, 4 May 2017 19:29:05 +0000 (19:29 +0000)]
Merge "Fix an NPE that can result from a race condition." into oc-dev
am:
d8aa2acea3
Change-Id: I6b167ad55790159769e13b77da1cf43106f1c654
Fyodor Kupolov [Thu, 4 May 2017 19:22:25 +0000 (12:22 -0700)]
Avoid reflection when mocking UserManagerService
Fixed a crash due to a change in the private constructor signature
Test: PackageManagerSettingsTests are passing
Bug:
37989886
Change-Id: I5d46f6018b4bdb369b2e39ad3020235e7f2c5a2e
Sundeep Ghuman [Thu, 4 May 2017 19:25:38 +0000 (19:25 +0000)]
Merge "Fix an NPE that can result from a race condition." into oc-dev
am:
d8aa2acea3
Change-Id: I41bfd05eb74502a034cf1289032ce6a8c50bcbd5
TreeHugger Robot [Thu, 4 May 2017 19:17:57 +0000 (19:17 +0000)]
Merge "Fix an NPE that can result from a race condition." into oc-dev
Yang Ni [Thu, 4 May 2017 19:08:27 +0000 (19:08 +0000)]
Merge "Destroy Allocation with ScriptIntrinsicLut" am:
622b140f94 am:
088eca8302
am:
43dca4780f
Change-Id: Ic180a772a7131e32987364d01581b0333315b798
Yang Ni [Thu, 4 May 2017 19:02:44 +0000 (19:02 +0000)]
Merge "Destroy Allocation with ScriptIntrinsicLut" am:
622b140f94
am:
088eca8302
Change-Id: I9b5cf20890474a8921def39b955863cf7eaade67
Yang Ni [Thu, 4 May 2017 18:56:34 +0000 (18:56 +0000)]
Merge "Destroy Allocation with ScriptIntrinsicLut"
am:
622b140f94
Change-Id: I7d781ce6f36d0205bb35a9b3416e4ea55f4b8eeb
Kevin Chyn [Thu, 4 May 2017 18:47:38 +0000 (11:47 -0700)]
RemovalClient sendRemoved should check remaining instead of fingerId
Test: for each of the following, make sure code goes into
if (client != null && client.onRemoved(fingerId, groupId, remaining)) {
removeClient(client);
}
1) remove single fingerprint
2) remove all fingerprint by removing password
Change-Id: I6f1ebd42c05fd57225dd4808766791ff1922b09e
Fixes:
37992170
Yang Ni [Thu, 4 May 2017 18:44:28 +0000 (18:44 +0000)]
Merge "Destroy Allocation with ScriptIntrinsicLut"
Yang Ni [Fri, 28 Apr 2017 15:50:33 +0000 (08:50 -0700)]
Destroy Allocation with ScriptIntrinsicLut
Bug:
28053584
On destroying the intrinsic, destroy its contained Allocation right away.
Test: CTS on x86_64 emulator
Change-Id: I5ca0da33b620c3291b7cafda31a6cc83eb7461a0
Jack Yu [Thu, 4 May 2017 18:37:33 +0000 (18:37 +0000)]
Merge "Merge "Moved data retry handler from broadcast to message." am:
19cd7568c6" into stage-aosp-master am:
6904af3684 -s ours
am:
951549ed0f -s ours
Change-Id: Ia185fabdad280d9fd6bcb122f512a50ac27d4476
OSDN Git Service
