OSDN Git Service
TreeHugger Robot [Wed, 19 Apr 2017 19:43:53 +0000 (19:43 +0000)]
Merge "Force data usage bottom label to be LTR." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:43:02 +0000 (19:43 +0000)]
Merge "Bring up the QS state colors to increase contrast" into oc-dev
Fan Zhang [Tue, 18 Apr 2017 22:15:21 +0000 (15:15 -0700)]
Force data usage bottom label to be LTR.
The bottom label has to be LTR to be in sync with the main view above
it, which does not support RTL.
Change-Id: Ib5cccd1cccb249dad0badd36f4d491faf0bbb562
Fix:
37222561
Test: visual
TreeHugger Robot [Wed, 19 Apr 2017 19:20:39 +0000 (19:20 +0000)]
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:06:04 +0000 (19:06 +0000)]
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:00:54 +0000 (19:00 +0000)]
Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 18:42:31 +0000 (18:42 +0000)]
Merge "Fix issue where the notification could snap to the menu while its invisible" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 18:41:44 +0000 (18:41 +0000)]
Merge "Update snooze visuals to match latest design" into oc-dev
Zheng Zhang [Wed, 19 Apr 2017 18:32:55 +0000 (18:32 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours
am:
74b8c15d2b -s ours
Change-Id: I4e023353faf1cbded69661da7013785bd130297c
Zheng Zhang [Wed, 19 Apr 2017 18:26:33 +0000 (18:26 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev
am:
5b84ba3b15 -s ours
Change-Id: Ic447d9ee4910f467e8ca6dad7d02693846e4fab8
TreeHugger Robot [Wed, 19 Apr 2017 18:21:43 +0000 (18:21 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev
TreeHugger Robot [Wed, 19 Apr 2017 18:15:31 +0000 (18:15 +0000)]
Merge "Adds getLayoutInflater() to return a cached value." into oc-dev
Winson Chung [Wed, 19 Apr 2017 18:10:16 +0000 (18:10 +0000)]
Merge "Adding consistent platform PiP action asset." into oc-dev
Evan Rosky [Wed, 19 Apr 2017 18:08:23 +0000 (18:08 +0000)]
Merge "Handle edge-case where no focusables exist" into oc-dev
Jason Monk [Wed, 19 Apr 2017 18:07:04 +0000 (18:07 +0000)]
Merge "Swap back content alphas for light and dark." into oc-dev
Yohei Yukawa [Wed, 19 Apr 2017 17:37:13 +0000 (17:37 +0000)]
Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 17:33:55 +0000 (17:33 +0000)]
Merge "Add missing services to incident_report" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 17:32:25 +0000 (17:32 +0000)]
Merge "Fix issue with fontScale changes not taking effect" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 17:32:02 +0000 (17:32 +0000)]
Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 17:24:02 +0000 (17:24 +0000)]
Merge "Internal copy of Palette API." into oc-dev
Jason Monk [Wed, 19 Apr 2017 17:11:11 +0000 (13:11 -0400)]
Bring up the QS state colors to increase contrast
Test: visual
Change-Id: I5182e3dae7be89bf38d0ed33e3cbefedc664c718
Fixes:
37443237
Sunny Goyal [Wed, 19 Apr 2017 17:10:37 +0000 (17:10 +0000)]
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev
Robert Greenwalt [Wed, 19 Apr 2017 17:09:30 +0000 (17:09 +0000)]
Merge "Mark Restricted APN connections as restricted." into oc-dev
Zheng Zhang [Wed, 19 Apr 2017 01:16:33 +0000 (18:16 -0700)]
DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123.
HFP profile config landed late in Emerald development, and was committed
as version 122 there.
When it merged to master, there were conflicts since 122 was already
taken, so it was resolved as version 123.
We didn't catch the subtle bug then:
This means Emerald devices will reset HFP profile config in error once
they upgrade to Feldspar.
Correct this by merging 122, and making 123 a no-op.
Bug:
37338202
Change-Id: Ibf4c824d27300641fd1bb15f5884baf056bd8d7e
TreeHugger Robot [Wed, 19 Apr 2017 16:42:38 +0000 (16:42 +0000)]
Merge "MediaSessionService: Nullify the media button sesison when it's removed" into oc-dev
Tao Bao [Wed, 19 Apr 2017 16:30:22 +0000 (16:30 +0000)]
Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev
Keun-young Park [Wed, 19 Apr 2017 16:12:02 +0000 (16:12 +0000)]
Merge "fs_stat: ignore quota fix caused by tree optimization" into oc-dev
Tao Bao [Wed, 19 Apr 2017 15:54:18 +0000 (15:54 +0000)]
Merge "RecoverySystem: Verify the package compatibility." into oc-dev
Jason Monk [Wed, 19 Apr 2017 14:49:37 +0000 (10:49 -0400)]
Swap back content alphas for light and dark.
Someone may have accidentally switched them...
Change-Id: If9039398548a7ce9d7f38941ba774a05e8bedcb8
Fixes:
37483431
Test: visual
George Mount [Wed, 19 Apr 2017 14:29:45 +0000 (07:29 -0700)]
Fix FragmentTransaction.show() to show the fragment.
Bug
37413327
When there was an animation and the fragment transaction wasn't
optimized, the fragment visiiblity wasn't being set during show().
Test: I0fd4029a02d6c9f082011bf56f0d3c8245803f68
Change-Id: Idc2c74ae2fc4759a755a5988ce6ca1b39ef8d554
Julia Reynolds [Wed, 19 Apr 2017 13:45:02 +0000 (13:45 +0000)]
Merge changes I1d00d86e,I16d81113 into oc-dev
* changes:
Silence non-clickable imagebutton
Remove log spam
Julia Reynolds [Wed, 19 Apr 2017 13:44:18 +0000 (13:44 +0000)]
Merge "Don't clear snoozed components on restore." into oc-dev
Abodunrinwa Toki [Thu, 13 Apr 2017 08:56:52 +0000 (09:56 +0100)]
TextClassifierImpl: Fix empty locale list issue.
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug:
37289966
Change-Id: Ib822f2cc2fbaeb67dcc06e1f9fea306ee1c8c9ef
Philipp Weiß [Wed, 19 Apr 2017 09:25:38 +0000 (09:25 +0000)]
Merge "Redesign of QSSecurityFooter" into oc-dev
Narayan Kamath [Wed, 19 Apr 2017 08:03:00 +0000 (08:03 +0000)]
Merge "Binder: Log details of pending exception." into oc-dev
Jaewan Kim [Wed, 29 Mar 2017 18:22:03 +0000 (03:22 +0900)]
MediaSessionService: Nullify the media button sesison when it's removed
When the media button sesison is removed, we'd better not pick the
alternative media button session within the app because the alternative
media session might be a dummy which isn't able to handle media keys.
Test: Run the CtsMediaTest (MediaSessionTest and MediaSessionManagerTest)
and the manual test (Launch a media app which creates two media
sessions, and confirmed that another media session doesn't become the
media button session when the media button session is removed)
Change-Id: I376a34ee4b5d2344007594134c40b135b2c5a1bf
Felipe Leme [Wed, 19 Apr 2017 05:05:44 +0000 (05:05 +0000)]
Merge "Some Autofill API changes." into oc-dev
Keun-young Park [Mon, 17 Apr 2017 23:17:28 +0000 (16:17 -0700)]
fs_stat: ignore quota fix caused by tree optimization
- tree optimization leads into quota fix which is not a real fix.
- Distinguish such case from real file system fix to get fs statistics
correctly.
- This is only for correct fs stat metric collection. There is no
functionality change in device side.
- Full parsing is only run when fs fix is detected from fs_stat.
Examplt of fsck fix that will be ignored as optimization:
e2fsck 1.43.3 (04-Sep-2016)
Pass 1: Checking inodes, blocks, and sizes
Inode 877141 extent tree (at level 1) could be shorter. Fix? yes
Pass 1E: Optimizing extent trees
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
[QUOTA WARNING] Usage inconsistent for ID 10038:actual (
71667712, 1000) != expected (
71671808, 1000)
Update quota info for quota type 0? yes
[QUOTA WARNING] Usage inconsistent for ID 10038:actual (
59555840, 953) != expected (
59559936, 953)
Update quota info for quota type 1? yes
/dev/block/platform/soc/624000.ufshc/by-name/userdata: ***** FILE SYSTEM WAS MODIFIED *****
- also added unit test for the fsck log parsing
bug:
36391645
Test: many reboots with fs_stat check, runtest frameworks-services -c com.android.server.BootReceiverFixFsckFsStatTest
Change-Id: I86a97a3b50ee573db51d19d2cd243b8f7795a165
TreeHugger Robot [Wed, 19 Apr 2017 03:17:45 +0000 (03:17 +0000)]
Merge "Fix for SurfaceView out of a view hierarchy" into oc-dev
Svetoslav Ganov [Wed, 19 Apr 2017 02:44:11 +0000 (02:44 +0000)]
Merge "Address API council comments" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 02:43:40 +0000 (02:43 +0000)]
Merge "Creating a common class for loading drawables and handling various badging" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 02:43:00 +0000 (02:43 +0000)]
Merge "Add a way to read the last AutofillSelection." into oc-dev
Felipe Leme [Wed, 19 Apr 2017 00:48:49 +0000 (17:48 -0700)]
Some Autofill API changes.
- Added View.IMPORTANT_FOR_AUTOFILL_YES_INCLUDE_DESCENDANTS
- Added View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS
- Added FillResponse.Builder.setIgnoredIds()
- Fixed javadoc links.
These changes are not implemented yet....
Bug:
37424141
Bug:
36171235
Test: m update-api
Change-Id: I604960443ab08cd3f2a84a70b0a2cece7cb0a00c
Winson Chung [Wed, 19 Apr 2017 02:01:40 +0000 (19:01 -0700)]
Adding consistent platform PiP action asset.
Bug:
36782878
Test: This is just an asset
Change-Id: I43fdafcc8d2626d5fe0c61935ff09137ad0d6e0a
Yu Liu [Wed, 19 Apr 2017 01:33:04 +0000 (01:33 +0000)]
Merge "Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council Test: Existing unit tests still pass. BUG:
36552859" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 01:31:41 +0000 (01:31 +0000)]
Merge "update docs per API council" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 01:29:10 +0000 (01:29 +0000)]
Merge changes I062b6c37,Ie5165364,Ib3cce253 into oc-dev
* changes:
Add remaining default media icons.
Disable PiP when a task is locked.
Fix issue with PiP actions flashing.
Nathan Harold [Wed, 19 Apr 2017 00:36:16 +0000 (00:36 +0000)]
Merge "Hide Socket+DatagramSocket IpSecTransform methods" into oc-dev
Chen Xu [Wed, 19 Apr 2017 00:34:52 +0000 (00:34 +0000)]
Merge "better defualt behaviour for msim" into oc-dev
Nathan Harold [Wed, 19 Apr 2017 00:34:20 +0000 (00:34 +0000)]
Merge "Consistenly Throw IOExceptions from IpSecManager" into oc-dev
Winson Chung [Wed, 19 Apr 2017 00:22:35 +0000 (00:22 +0000)]
Merge "Update Overview content descriptions." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 00:20:05 +0000 (00:20 +0000)]
Merge "Clone autofill service settings on managed profile." into oc-dev
Philip P. Moltmann [Mon, 17 Apr 2017 21:18:33 +0000 (14:18 -0700)]
Add a way to read the last AutofillSelection.
- Check UID to make sure one service cannot read FillSelections of other
services
- Add id to Dataset to allow to tag the datasets. This id is then found
in the FillSelection.Event
- Add clientState to FillSelection to allow service to store more data
Fixes:
36871500
Test: CtsAutoFillServiceTestCases
Change-Id: Ice894245508227265294a1c59ea97842175e5aec
Adam Lesinski [Tue, 18 Apr 2017 21:42:22 +0000 (14:42 -0700)]
Fix issue with fontScale changes not taking effect
If a configuration change occurs, and an underlying ResourcesImpl is
swapped out under a Resources object, the DisplayMetrics cached by
TypedArray will be stale and not up-to-date.
Bug:
34120637
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerConfigChangeTests
Change-Id: Id78a6d259250950387c2e95c4a2292fdd095c7af
Svetoslav Ganov [Tue, 18 Apr 2017 21:28:35 +0000 (14:28 -0700)]
Address API council comments
Test: all static shared lib CTS tests pass
bug:
37327970
Change-Id: Ie8c4d853da5fa0a6125b9def38831860f79ce53d
TreeHugger Robot [Tue, 18 Apr 2017 23:43:21 +0000 (23:43 +0000)]
Merge "Add logging to WebView zygote package preload." into oc-dev
Sunny Goyal [Wed, 12 Apr 2017 22:36:42 +0000 (15:36 -0700)]
Creating a common class for loading drawables and handling various badging
Test: Manually tested on device
Bug:
36591157
Change-Id: Ic847537d416650015cecaeb68f47f7f032e0dbaa
TreeHugger Robot [Tue, 18 Apr 2017 23:32:02 +0000 (23:32 +0000)]
Merge "guard against nulls in LogMaker" into oc-dev
Todd Kennedy [Mon, 17 Apr 2017 22:29:46 +0000 (15:29 -0700)]
update docs per API council
Change-Id: Id32be4db7671d3ef99e155f5fc2f3946eac707dd
Fixes:
37322490
Test: treehugger
TreeHugger Robot [Tue, 18 Apr 2017 23:25:53 +0000 (23:25 +0000)]
Merge "Change nullability of colorspace parameter" into oc-dev
Winson Chung [Tue, 18 Apr 2017 22:05:31 +0000 (15:05 -0700)]
Add remaining default media icons.
- Fix issue where strings were only in overlay and not in base resources
Bug:
36778575
Test: Launch PiP activity with media session, ensure actions show
Change-Id: I062b6c37ff4789bf375670e8ce872f28c578ffca
TreeHugger Robot [Tue, 18 Apr 2017 23:12:35 +0000 (23:12 +0000)]
Merge "Use wifi icon for wifi devices in companion chooser" into oc-dev
Yu Liu [Tue, 18 Apr 2017 23:08:29 +0000 (16:08 -0700)]
Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council
Test: Existing unit tests still pass.
BUG:
36552859
Change-Id: Ib4cdcef90be3d5b3be329dd780bcb40275b89ef4
TreeHugger Robot [Tue, 18 Apr 2017 23:03:00 +0000 (23:03 +0000)]
Merge "Part of global strings change from cellular —> mobile." into oc-dev
Tao Bao [Tue, 18 Apr 2017 22:53:40 +0000 (15:53 -0700)]
RecoverySystem: Enable the package compatibility verification.
Hook up to android.os.VintfObject.verify().
Bug:
36592877
Test: Flash on marlin; verify with package that has and doesn't have
compatibility.zip entry.
Change-Id: I4e73fa42f4e3fd2e1c5ffec2ffa6152538d62eee
Evan Rosky [Tue, 18 Apr 2017 22:54:01 +0000 (22:54 +0000)]
Merge "Ignore nested keyboard navigation clusters" into oc-dev
Evan Rosky [Mon, 17 Apr 2017 23:40:16 +0000 (16:40 -0700)]
Handle edge-case where no focusables exist
cluster navigation was previously crashing if there was
nothing focusable..
Bug:
37438383
Test: Added CTS: ContentPaneFocusTest#testNoFocusablesInContent
Ran against support-v7-demos Toolbar demos to verify
crash didn't occur
Change-Id: Ia1382cec138a948d080aeded4d38735983df2152
Philip P. Moltmann [Tue, 18 Apr 2017 22:28:13 +0000 (22:28 +0000)]
Merge "Change saveOnAllViewsInsible from boolean to flags" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 22:15:13 +0000 (22:15 +0000)]
Merge "Fixed WTF that happens on race condition." into oc-dev
Felipe Leme [Tue, 18 Apr 2017 21:54:33 +0000 (14:54 -0700)]
Clone autofill service settings on managed profile.
Test: manual verification
Change-Id: I9d13e4230265b18444bfd30fd403c5fb98b88159
Fixes:
37351722
TreeHugger Robot [Tue, 18 Apr 2017 22:09:25 +0000 (22:09 +0000)]
Merge "update docs per API council" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 22:05:30 +0000 (22:05 +0000)]
Merge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev
Winson Chung [Tue, 18 Apr 2017 21:52:36 +0000 (14:52 -0700)]
Disable PiP when a task is locked.
Bug:
37135610
Test: Start PiP, enable screen pinning, ensure that PiP is dismissed.
Change-Id: Ie5165364db891b13dd4ef282089f915fe9f99615
Chris Wren [Tue, 18 Apr 2017 17:40:32 +0000 (13:40 -0400)]
guard against nulls in LogMaker
Bug:
36909905
Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Change-Id: Ibd12bf12f9b1ed5fbc926ec04bbfa429ff98f7d2
TreeHugger Robot [Tue, 18 Apr 2017 21:39:39 +0000 (21:39 +0000)]
Merge "Adjust some of the timings around animating / showing the dismiss gradient" into oc-dev
Bryce Lee [Tue, 18 Apr 2017 21:30:58 +0000 (21:30 +0000)]
Merge "Allow at most one pinned stack task." into oc-dev
Torne (Richard Coles) [Tue, 18 Apr 2017 21:16:36 +0000 (17:16 -0400)]
Add logging to WebView zygote package preload.
This is a potentially slow event and having a timestamp for when it
started/completed may help to track down a currently-open bug (as well
as enable us to see how long preloading took). This only happens once
per boot and once per WebView update so won't cause a significant amount
of logging.
Bug:
37347817
Test: check for messages in logcat on first use of WebView
Change-Id: Ib6c50eea71324f81cda5b5b1ac91f9dc806e0ab4
Eugene Susla [Tue, 18 Apr 2017 20:45:17 +0000 (13:45 -0700)]
Use wifi icon for wifi devices in companion chooser
Test: Ensure wifi devices have wifi icon
Change-Id: I08c9fba1acaefb097a010b1150cc052d5a397adc
Dan Sandler [Mon, 17 Apr 2017 14:09:24 +0000 (10:09 -0400)]
Part of global strings change from cellular —> mobile.
Bug:
33049102
Fixes:
36389122
Test: no
Change-Id: I0438f63f643d144e065b8394bec36fb6e1ec7aa9
Casey Burkhardt [Tue, 18 Apr 2017 21:09:01 +0000 (21:09 +0000)]
Merge "Minor UI adjustments to a11y button chooser" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 21:07:44 +0000 (21:07 +0000)]
Merge "Fixing javadoc errors for pm#canRequestPackageInstalls" into oc-dev
Romain Guy [Tue, 18 Apr 2017 21:06:49 +0000 (14:06 -0700)]
Change nullability of colorspace parameter
Bug:
37323693
Test: android.graphics.cts.BitmapColorSpaceTest
Change-Id: I705ac18e5c64c028c2e8366a18ec4ef20f44a630
TreeHugger Robot [Tue, 18 Apr 2017 20:33:43 +0000 (20:33 +0000)]
Merge "Check if singleLineTitle attribute is set for the preference." into oc-dev
Winson Chung [Tue, 18 Apr 2017 19:54:25 +0000 (12:54 -0700)]
Fix issue with PiP actions flashing.
- Instead of recreating the whole layout, only add/hide action views as
necessary
Bug:
35467434
Test: Launch PiP, tap some actions
Change-Id: Ib3cce253228d737bb699f80298001f08121640e4
Abodunrinwa Toki [Tue, 18 Apr 2017 20:13:22 +0000 (20:13 +0000)]
Merge "Move TextClassificationManagerTest to coretests" into oc-dev
Wei Wang [Tue, 18 Apr 2017 18:26:26 +0000 (11:26 -0700)]
Add a wakelock timeout when downloading xtra data for GNSS.
Test: manual
Bug:
36973866
Change-Id: Ia7168f313abebbf3c5c4fc26567ed914f1987a91
Erik Wolsheimer [Tue, 18 Apr 2017 20:09:30 +0000 (20:09 +0000)]
DO NOT MERGE Mask case of base or tree permission being null am:
cb8a640cef
am:
28fc6a28aa -s ours
Change-Id: I3e83332cd4bd7e51a3394ee5de61afc613fe9552
Etan Cohen [Tue, 18 Apr 2017 20:04:16 +0000 (20:04 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier" into oc-dev
Erik Wolsheimer [Tue, 18 Apr 2017 20:03:46 +0000 (20:03 +0000)]
DO NOT MERGE Mask case of base or tree permission being null
am:
cb8a640cef
Change-Id: I43289a33b8e1e6df9307cd11891feff4d739da14
Chris Craik [Tue, 18 Apr 2017 18:21:55 +0000 (11:21 -0700)]
Re-hide shader mutation, remove colorfilter mutation
Bug:
36025103
Bug:
37327129
Test: boots, CtsGraphicsTestCases passes
Change-Id: I937f8ae26ed47b4811dc033ed91c257670fc3a39
TreeHugger Robot [Tue, 18 Apr 2017 19:50:36 +0000 (19:50 +0000)]
Merge "Decrease number of network logging notifications shown" into oc-dev
Sunny Goyal [Tue, 18 Apr 2017 19:48:06 +0000 (12:48 -0700)]
Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host
Bug:
37435178
Test: Added CTS
Change-Id: I621247e0887b3931bfb92431d94f97507a303e5c
Mady Mellor [Tue, 18 Apr 2017 19:48:04 +0000 (12:48 -0700)]
Adjust some of the timings around animating / showing the dismiss gradient
Dan wanted longer + linear fade in of the dismiss gradient. Also wanted
fade out to match the timing of 'snap to edge'.
Test: Manual -- move PIP around, observe how gradient fades in / out
Bug:
35358628
Change-Id: I847d96e70184c0093e64a7e2e895a9c5f30fea8b
Wale Ogunwale [Tue, 18 Apr 2017 19:40:43 +0000 (19:40 +0000)]
Merge "Fixed some pip state acitvity accounting." into oc-dev
Julia Reynolds [Tue, 18 Apr 2017 19:13:05 +0000 (19:13 +0000)]
Merge "Lock all the things" into oc-dev
Winson Chung [Tue, 18 Apr 2017 18:55:37 +0000 (11:55 -0700)]
Update Overview content descriptions.
- If there is a task label with a provided task description, ensure that
it is used instead of the activity label when generating the content
description (the concatenation of the badged application name and
activity label.
- Also fix a case where content descriptions can go stale if they are
updated between first preloaded. Just don't cache the content
description if there is a task description.
Bug:
37417229
Test: Launch Play store, go to Overview
Change-Id: Ieeef9ecd93759c130dc66902f249783e7d218be7
Erik Wolsheimer [Tue, 18 Apr 2017 16:27:31 +0000 (09:27 -0700)]
DO NOT MERGE Mask case of base or tree permission being null
Bug:
34850544
Change-Id: I4bf9e85d7e615ccdb75752503e58d7e7f47b04c2
Hassan Shojania [Tue, 18 Apr 2017 18:41:23 +0000 (18:41 +0000)]
Merge "MediaPlayer/ModularDrm API review" into oc-dev
Robert Greenwalt [Mon, 10 Apr 2017 21:32:23 +0000 (14:32 -0700)]
Mark Restricted APN connections as restricted.
If anything unrestricted is bundled in the whole thing has to be
unrestricted (we can't restrict based on destination or intent)
but the NOT_METERED flag wasn't taken into account.
This wasn't a problem before because telephony set that statically
and late, but a change caused it to be marked NOT_METERED earlier
which exposed this bug.
bug:
37208956
Test: new NetworkCapabilitiesTest. Fails without fix, works with.
Change-Id: I7b7a1c38621ce0ecde8cf041e82b1ebb7a9c6f15
Julia Reynolds [Tue, 18 Apr 2017 18:11:49 +0000 (14:11 -0400)]
Don't clear snoozed components on restore.
Change-Id: I2c4ba6d737147de243e37dee61d41b11da86eecb
Fixes:
34177065
Test: manual, snooze a listener, and then toggle off a different
listener