OSDN Git Service
fionaxu [Mon, 18 Sep 2017 18:12:24 +0000 (18:12 +0000)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev
am:
6e40562a73 -s ours
Change-Id: I65b0adc062d2bfc83590b24d04030d01790e5bd7
Selim Cinek [Mon, 18 Sep 2017 18:08:29 +0000 (18:08 +0000)]
Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev
fionaxu [Fri, 15 Sep 2017 20:52:04 +0000 (13:52 -0700)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Bug:
65113738
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa
TreeHugger Robot [Mon, 18 Sep 2017 17:13:25 +0000 (17:13 +0000)]
Merge "Refinement of auto-dimming nav" into oc-mr1-dev
Winson Chung [Mon, 18 Sep 2017 17:10:30 +0000 (17:10 +0000)]
Merge "Add low-ram check for PiP support even if feature is enabled." into oc-mr1-dev
TreeHugger Robot [Mon, 18 Sep 2017 16:47:40 +0000 (16:47 +0000)]
Merge "Minor fixes on WebView.onProvideAutofillVirtualStructure() javadoc." into oc-mr1-dev
Jason Monk [Mon, 18 Sep 2017 14:31:37 +0000 (10:31 -0400)]
Refinement of auto-dimming nav
- Make dimming only happen for interaction with nav
- Extend time to dim
- Shorten time to start dimming by same amount.
Test: visual
Change-Id: Ieb5b31bacdde9ce1952601ad65cff2d54386dd0f
Fixes:
65694001
Andrii Kulian [Mon, 18 Sep 2017 06:25:46 +0000 (06:25 +0000)]
Merge "Fix consequent activity launch on virtual displays" into oc-mr1-dev
Bill Yi [Sun, 17 Sep 2017 22:18:14 +0000 (22:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:52:54 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:19:42 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:05:22 +0000 (20:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:02:32 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:01:27 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:00:33 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:53:46 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:53:10 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:50:26 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:48:53 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:33:49 +0000 (19:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bryce Lee [Sat, 16 Sep 2017 19:33:21 +0000 (19:33 +0000)]
Merge "Do not stop paused activity when sleeping." into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 13:17:52 +0000 (06:17 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ided02ec91e7a2f5aacd8e5c28201672d14fceea7
Bill Yi [Sat, 16 Sep 2017 12:57:19 +0000 (05:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6dab1e6544868c0ac2e0e4029a969a216f4c9b4d
Bill Yi [Sat, 16 Sep 2017 06:57:48 +0000 (23:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic2ce0ef69af1bfd9f4b8980b3079b9756f93763c
Bill Yi [Sat, 16 Sep 2017 06:50:17 +0000 (23:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I431251ef3dc0930b820a108edc6b76f876639035
Bill Yi [Sat, 16 Sep 2017 04:55:46 +0000 (21:55 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic586e92feca951793fd3cb9a401093e57e05b015
Bill Yi [Sat, 16 Sep 2017 04:48:17 +0000 (21:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I81c38a635544d1672a6cbd1dc9528d95ccdbd894
Bill Yi [Sat, 16 Sep 2017 04:40:45 +0000 (21:40 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I3978b88537a89176a6926eab1c21e09ab169a2cc
Bill Yi [Sat, 16 Sep 2017 04:33:13 +0000 (21:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ib786e99af653b130f2547c8ed1e223f0ddbcf3c8
Bill Yi [Sat, 16 Sep 2017 04:18:28 +0000 (21:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ie25a5101373e7c24af943b998a27f6f02da62a34
Bill Yi [Sat, 16 Sep 2017 04:03:41 +0000 (21:03 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I8d182fda9abf6a8c4f5bb4f62de78e61a5c3d627
Bill Yi [Sat, 16 Sep 2017 03:56:07 +0000 (20:56 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ifdd0077f7516e9266a9f38ff474bc8f71cc7591b
Bill Yi [Sat, 16 Sep 2017 03:48:15 +0000 (20:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I61400c4699a3694bc91bc6672e7dc62a28545bcc
Bill Yi [Sat, 16 Sep 2017 03:43:03 +0000 (20:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ie76a52fa6f6c717d78db5f9c338b1fde5cc6b4ad
TreeHugger Robot [Sat, 16 Sep 2017 01:45:51 +0000 (01:45 +0000)]
Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev
Winson Chung [Fri, 15 Sep 2017 22:52:11 +0000 (15:52 -0700)]
Add low-ram check for PiP support even if feature is enabled.
Bug:
65602088
Test: Can not enter PiP on low-ram devices
Change-Id: I526cf73788fb4c7298433bee5cb54711820f042b
Kensuke Matsui [Thu, 3 Aug 2017 03:12:36 +0000 (12:12 +0900)]
Fix NPE which could occur when showing notification guts
SystemUI keeps shown heads-up notification for minimum display time
even if the notification is canceled right after it's posted.
This is intentional behavior but causes inconsistency between
mEntry and mRankingMap in NotificationData.
That inconsistency could cause NPE when showing notification guts.
To avoid this, update an Entry only when the corresponding Ranking
is available.
Fixes:
65567562
Test: manual - long press a missed call notification
immediately after receiving an incoming call
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java
Change-Id: I6dc70d8e57efa7af0f23862a00d0e18cf39dfebb
Felipe Leme [Fri, 15 Sep 2017 22:16:28 +0000 (15:16 -0700)]
Minor fixes on WebView.onProvideAutofillVirtualStructure() javadoc.
Test: mmm -j108 frameworks/base/:doc-comment-check-docs
Bug:
65751159
Change-Id: Ie60b1f32e4d9acc675c6e25b7d3e606049b6a3c3
Lucas Dupin [Fri, 15 Sep 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Color extraction should not block switchUser" into oc-mr1-dev
Felipe Leme [Fri, 15 Sep 2017 19:56:55 +0000 (12:56 -0700)]
Fixed size of autofill service icon on Save affordance.
Test: manual verification
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
65739885
Change-Id: Ic9efd7bbb853c28b2d869a609d21eff4e6ef6d2d
Bryce Lee [Fri, 15 Sep 2017 22:22:43 +0000 (15:22 -0700)]
Do not stop paused activity when sleeping.
This changelist removes logic added to stop a top level paused
activity when trying to sleep. Doing so delays sleep and leads to
double sleep requests on the client side as it will also try to
stop the activity on sleep.
Bug:
65457314
Test: manual
Change-Id: I252e2b968a537cf2d696972d6a65e43661875943
Selim Cinek [Fri, 15 Sep 2017 21:20:44 +0000 (21:20 +0000)]
Merge "Increased the text size for colorized notifications" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Sep 2017 19:31:22 +0000 (19:31 +0000)]
Merge "New metrics fields for selection logs" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Sep 2017 19:30:46 +0000 (19:30 +0000)]
Merge "getInstalledDialerApplications should not count ForwardIntentToParent" into oc-mr1-dev
Selim Cinek [Fri, 15 Sep 2017 00:09:25 +0000 (17:09 -0700)]
Increased the text size for colorized notifications
Increased the text sizes a bit to make them more prominent.
Test: add colorized notifications of all styles
Change-Id: Ie22053edcb0297e7c3ee0c43b29cdd0e7b6a4516
Fixes:
35925915
Neil Fuller [Fri, 15 Sep 2017 17:56:16 +0000 (17:56 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" into oc-mr1-dev
Chen Xu [Fri, 15 Sep 2017 17:54:26 +0000 (17:54 +0000)]
Merge "disable carrier actions on redirection by default" into oc-dev
TreeHugger Robot [Fri, 15 Sep 2017 17:50:51 +0000 (17:50 +0000)]
Merge "Don't take invisible screenshots" into oc-mr1-dev
Chris Tate [Fri, 15 Sep 2017 17:37:09 +0000 (17:37 +0000)]
Merge "Make sure that updated wallpaper id is immediate" into oc-mr1-dev
Hall Liu [Fri, 15 Sep 2017 17:17:38 +0000 (17:17 +0000)]
Merge changes from topic "embms-cherry-pick-3" into oc-mr1-dev
* changes:
API council suggested edits, part 3
Apply suggested edits to the file-download API
Make changes to MBMS Streaming APIs per recommendations
Tony Mak [Fri, 15 Sep 2017 16:41:43 +0000 (17:41 +0100)]
getInstalledDialerApplications should not count ForwardIntentToParent
Issues:
1. Work profile call is logged into work profile side even there
is no work profile dialer.
2. In Settings, "Android" is shown as the default work profile dialer.
Cause:
When are querying installed dialers in work profile,
getInstalledDialerApplications return android/ForwardIntentToParent
because we forward calls to personal side if work dialer
is absent. But apparently, ForwardIntentToParent is not an installed
dialer in work profile. So Settings shows "Android" as default work
dialer and Telecom wrongly think that we have work dialer and insert
calllog in to work profile side.
Solution:
Ignore cross profile resolver by checking targetUserId.
Test: Manual
1. Check Settings, no longer see "Android" is set as work dialer.
2. Make a phone call using work contacts, observed that the call
is inserted into persoonal side.
3. Make a phone call using personal side, observed that the call
is inserted into personal side.
BUG:
65672386
Change-Id: I13d4234ad1684f714e1b4d7704f2413d903a0179
Adam Lesinski [Fri, 15 Sep 2017 16:49:34 +0000 (16:49 +0000)]
Merge changes Id8bdb14e,I573a6735,Ia804777f,Ia68122cb,Ia1997800, ... into oc-mr1-dev
* changes:
AAPT2: Bump to version 2.19
AAPT2: Fix issue with resource deduping
AAPT: Dump badging should pickup strings from the right package
AAPT2: Change the daemon mode to be line based
AAPT2: better error handling for daemon mode
AAPT2: Fix regression in Manifest.java permissions
AAPT2: Define intermediate compiled XML proto
AAPT2: Add a daemon mode
AAPT2: Fix mkdirs implementation
AAPT2: Change XmlDom to exclude Namespace as a node
AAPT2: Fix windows unicode path issues
AAPT2: Fix typo in Config parsing
AAPT2: Change proto format to reduce usage of StringPool
AAPT2: Add navigation type
AAPT2: Document Format.proto
Jan Althaus [Thu, 14 Sep 2017 15:52:23 +0000 (17:52 +0200)]
New metrics fields for selection logs
Changes that affect logging:
- Switched to new category/actions/fields that are used exclusively by
selection logging.
- Action types are now logged in the tron type (the information that was
previously in the field could be derived from other fields).
- Entity types are now logged in the tron sub type.
- Delta time from previous event is now zero for first event (was time
since epoch).
- The smart select model version is now written for all events after
smart select has run. (i.e. better support for analysis based on
terminal events alone)
- Restoring the logging removed in ag/
2901629.
Internal only changes:
- Made debug statement conditional on DEBUG_LOG_ENABLED.
- Reduced logging tag length to fit into 23char limit.
Bug:
64914512
Test: Manually tested that logs are correct. Will follow up with automated tests.
Merged-In: If12daa2f206fb42be53587decbe2c4abfd689f41
Change-Id: Iec0f6cf1f9f2efdc8518133cf8551cd96b095ad8
Neil Fuller [Thu, 14 Sep 2017 08:34:56 +0000 (09:34 +0100)]
Fix a no-op uninstall being treated as a failure
Treat a stageUninstall() doing nothing as a success, not a
failure. This prevents the system retrying the uninstall
later.
Unit tests run with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/marlin/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above
Test: Manual testing, adb dumpsys timezone
Test: PTS: run pts -m PtsTimeZoneTestCases
Bug:
65657176
Merged-in: Ifd205da90e848552711ac3f4207cd22ad2c2747b
Change-Id: Ifd205da90e848552711ac3f4207cd22ad2c2747b
(cherry picked from commit
8e27c9226b82f41279ee6c108d2b06bb6f1cef5e)
Jorim Jaggi [Fri, 15 Sep 2017 12:17:40 +0000 (14:17 +0200)]
Don't take invisible screenshots
This fixes a bug where we took a snapshot of a task while the
surface wasn't visible yet. The transition was set-up so the win
animator was already shown but translucency was set to 0, leading
that the snapshot is a black screen.
We fixed this by also checking whether the alpha is non-zero.
Fixes a bug where launching a Hangouts notification from the
lockscreen causes a black flicker. When we launch the activity,
the Hangouts activity is in the mClosingApps list, because it's
immediately hidden from the lockscreen, which means we try to take
a snapshot. Shortly after that we reopen the activity because
Keyguard is going away, so we try to reuse a snapshot.
Test: go/wm-smoke
Test: Open hangouts, close hangouts with back button, go to
Keyguard, receive message, launch notification
Change-Id: Iffc1db1a738800c90a2421a5f90174d647eb4440
Fixes:
65695379
Neil Fuller [Fri, 15 Sep 2017 09:40:05 +0000 (09:40 +0000)]
Merge "Finalize package intents used to trigger tz update" into oc-mr1-dev
Adam Lesinski [Wed, 13 Sep 2017 21:46:00 +0000 (14:46 -0700)]
AAPT2: Bump to version 2.19
Test: manual
Bug:
65645766
Change-Id: Id8bdb14e498bd79ff642f9ad56ef05ec7a5825af
Merged-In: Id8bdb14e498bd79ff642f9ad56ef05ec7a5825af
TreeHugger Robot [Fri, 15 Sep 2017 03:39:41 +0000 (03:39 +0000)]
Merge "Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS" into oc-mr1-dev
Jiyong Park [Fri, 15 Sep 2017 02:19:19 +0000 (02:19 +0000)]
Merge "Fix missing null checking" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Sep 2017 02:15:23 +0000 (02:15 +0000)]
Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Sep 2017 02:11:12 +0000 (02:11 +0000)]
Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev
Jean-Michel Trivi [Fri, 15 Sep 2017 01:37:55 +0000 (01:37 +0000)]
Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev
Kevin Hufnagle [Fri, 15 Sep 2017 01:01:15 +0000 (01:01 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df
am:
91fb9b2a16
Change-Id: Ib5ff83e4ce6c5a172db8f483387ebb6a8a97ae55
TreeHugger Robot [Fri, 15 Sep 2017 00:56:22 +0000 (00:56 +0000)]
Merge "Do not animate icons when leaving AoD" into oc-mr1-dev
fionaxu [Wed, 6 Sep 2017 21:19:16 +0000 (14:19 -0700)]
disable carrier actions on redirection by default
1. the assumption of "carrier will redirect users to their captive
portal page when users dont have data plan" might not be true for all
carriers. We have seem issues like carriers random redirect users when
they still have balance left.
2. turn this off by default and turn it on if the carrier is
behaving correctly and agree with it.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Bug:
65113738
Test: Manual
Change-Id: I60be2de3aa227298e60ea7eb9535bad8967b1fe3
Kevin Hufnagle [Fri, 15 Sep 2017 00:42:20 +0000 (00:42 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev
am:
6087b990df
Change-Id: Idc629243c3794565cdfebe7bd737a78d97010295
Hall Liu [Sat, 9 Sep 2017 01:02:38 +0000 (18:02 -0700)]
API council suggested edits, part 3
* MbmsException no longer thrown from the common methods, and the error
codes are now containined in MbmsError.
* In order to avoid ANRs while processing download-done broadcasts,
don't perform arbitrary moves when a download is done. Instead, move
into a staging directory and let the app handle it.
Bug:
30981736
Test: testapps
Change-Id: I9416f28b4f24f89af1da6f56a93ea0f0e4ea3878
Kevin Hufnagle [Fri, 15 Sep 2017 00:12:41 +0000 (00:12 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev
Hall Liu [Sat, 2 Sep 2017 00:59:15 +0000 (17:59 -0700)]
Apply suggested edits to the file-download API
* Rename Manager -> Session
* Add Handler for callbacks in download flow
* Separate out registering a state callback into another method
* Rename dispose -> close, implement AutoClosable
* No more thrown MbmsExceptions
* Add sanity check for temp file root
* Remove the getNames method, replace with getNameForLocale
Bug:
30981736
Test: testapps
Change-Id: I1a2054d79c934bc4929464de4a644b6960db47e9
Yohei Yukawa [Thu, 14 Sep 2017 23:35:06 +0000 (16:35 -0700)]
Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS
TYPE_TEXT_FLAG_NO_SUGGESTIONS is just a hint and does not mean
IME should never show a UI to display suggestions.
This CL makes that point clear in JavaDoc.
Test: checkbuild
Bug:
35875399
Bug:
38139781
Bug:
38184682
Fixes:
65693181
Change-Id: Id0c3b6bc05689a5f1c8b52637664f59d45850a60
TreeHugger Robot [Thu, 14 Sep 2017 23:28:24 +0000 (23:28 +0000)]
Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 23:27:04 +0000 (23:27 +0000)]
Merge "Fixes quick switch animation entering recents for low ram devices" into oc-mr1-dev
Jiyong Park [Thu, 14 Sep 2017 22:48:06 +0000 (07:48 +0900)]
Fix missing null checking
Bug:
65666724
Test: build
Change-Id: Ie3fa891da012cbb3f313a33e0e5759f743887480
TreeHugger Robot [Thu, 14 Sep 2017 22:26:55 +0000 (22:26 +0000)]
Merge "Added SafetyNet logging for UsbDebugging security bug." into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 22:19:41 +0000 (22:19 +0000)]
Merge "Show big text on AoD" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 21:49:43 +0000 (21:49 +0000)]
Merge "Use correct date pattern for displaying year in DatePicker" into oc-mr1-dev
Lei Yu [Thu, 14 Sep 2017 21:31:11 +0000 (21:31 +0000)]
Merge "Change battery icon to the side of bt icon" into oc-mr1-dev
Lucas Dupin [Thu, 14 Sep 2017 21:15:42 +0000 (14:15 -0700)]
Color extraction should not block switchUser
switchUser is called from the main thread. This would block it
until color extraction ends, possibly causing a timeout in
ActivityManager.
We're now offloading color extraction to another thread.
Test: Change wallpapers, switch users.
Change-Id: I570c3ce5a562b56106d614c8febc12134e151afc
Fixes:
65146279
Andreas Gampe [Thu, 14 Sep 2017 21:02:09 +0000 (14:02 -0700)]
Frameworks: Fix NPE for agent attach
Fix missing null check.
Bug:
62445317
Test: m
Test: adb shell am start --attach-agent dummy.so
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsJvmtiAttachingHostTestCases
Change-Id: Ia16c2973b24f81839d20502339978e75a23a93bc
sergeyv [Thu, 14 Sep 2017 18:41:54 +0000 (11:41 -0700)]
Throw if BitmapFactory.Options.inBitmap is HARDWARE
Test: BitmapRegionDecoderTest#testHardwareBitmapIn
bug:
34415265
Change-Id: I58061504dd42ba918f89e1e5daf668f7601ca8d3
Hall Liu [Mon, 28 Aug 2017 21:10:46 +0000 (14:10 -0700)]
Make changes to MBMS Streaming APIs per recommendations
* Rename MbmsStreamingManager -> MbmsStreamingSession
* MbmsStreamingSession now implements AutoClosable instead of using
dispose()
* No longer throw checked MbmsExceptions from any methods. All such
errors will be reported via the async callback.
* null arguments no longer accepted for Handlers
* Guarantee that no further callbacks will get enqueued after closing.
Test: run testapps
Bug:
30981736
Merged-In: I6db045053f1baa4cd4de3718865fcfe525e8a4d6
Change-Id: I85e98850759c6c7fe7b883ffffa5b1f4e362770d
Chris Wren [Thu, 14 Sep 2017 19:55:32 +0000 (19:55 +0000)]
Merge "also log user-initiated notification collapse events" into oc-mr1-dev
Philip P. Moltmann [Thu, 14 Sep 2017 19:52:31 +0000 (19:52 +0000)]
Merge "Do not fail session.commit on current thread" into oc-mr1-dev
Julia Reynolds [Thu, 14 Sep 2017 19:26:25 +0000 (19:26 +0000)]
Merge "Clear calling identity" into oc-mr1-dev
Julia Reynolds [Thu, 14 Sep 2017 19:19:56 +0000 (19:19 +0000)]
Merge "Display volume dialog for longer..." into oc-mr1-dev
Beverly [Thu, 24 Aug 2017 13:33:57 +0000 (09:33 -0400)]
Added SafetyNet logging for UsbDebugging security bug.
Bug:
62187985
Test: n/a
Change-Id: I69244381b2172357c5adc8785fc73d1cfd3cc17d
Beverly Tai [Thu, 14 Sep 2017 19:09:35 +0000 (19:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am:
d740b2d09a -s ours
am:
fe5ce91c5f -s ours
Change-Id: I28bb498ea60d1a42d4b557f0b58c7134650bb3dd
Beverly Tai [Thu, 14 Sep 2017 19:00:40 +0000 (19:00 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
am:
d740b2d09a -s ours
Change-Id: I952391f1801cd678240b145971a733c755f62078
Beverly Tai [Thu, 14 Sep 2017 18:49:00 +0000 (18:49 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
Hall Liu [Thu, 14 Sep 2017 18:39:46 +0000 (18:39 +0000)]
Merge "Unhide EMBMS download API" into oc-mr1-dev
Christopher Tate [Mon, 11 Sep 2017 22:52:54 +0000 (15:52 -0700)]
Make sure that updated wallpaper id is immediate
As soon as setBitmap() or equivalent returns, the new wallpaper id needs
to be immediately observable. This was being subverted by inconsistent
and racy "initialize from persisted state" handling in the set-wallpaper
case: a load triggered by rebinding the static image display service
could in some cases wind up overriding the new state calculated while
new wallpaper imagery was being processed.
The fix is to clarify the semantics of when load-from-persisted happens:
it is now done *only* when the user is first spun up (or at boot, for
the system user), and a firm guarantee provided about the up-front
availability of the associated bookkeeping. That, in turn, means not
having to futz with lazy init when some client wants to read the current
wallpaper imagery, and eliminating that gets rid of the races.
And in a strictly-cosmetic fix, corrected the descriptive text for one
of the permission enforcement calls. Copypasta strikes again!
Bug:
65016846
Test: cts-tradefed run cts-dev -m CtsAppTestCases -t android.app.cts.WallpaperManagerTest\#setBitmapTest
Change-Id: I73da48a58cca1849f073b8aea72019916dc2272b
TreeHugger Robot [Thu, 14 Sep 2017 18:34:55 +0000 (18:34 +0000)]
Merge "Show mobile signal strength in QS edit panel" into oc-mr1-dev
Adam Lesinski [Wed, 30 Aug 2017 23:12:05 +0000 (16:12 -0700)]
AAPT2: Fix issue with resource deduping
Resource deduping relies on the definitions of
ConfigDescription.ConflictsWith, ConfigDescription.IsCompatibleWith,
and ConfigDescription.Dominates.
ConflictsWith is supposed to ignore range-based qualifiers, like
version, density, smallest width, screen size, etc.
This was not the case for screen size, and was assumed that the
choice of screen size is mutually exclusive.
This CL fixes the assumption and includes screen size (small, normal, large, xlarge)
as a qualifier that does not conflict.
Bug:
64397629
Bug:
65645766
Test: make aapt2_tests
Change-Id: I573a6735fedd7721a10ba32902bc5d27ef99b88e
Merged-In: I573a6735fedd7721a10ba32902bc5d27ef99b88e
Adam Lesinski [Sat, 26 Aug 2017 00:29:47 +0000 (17:29 -0700)]
AAPT: Dump badging should pickup strings from the right package
A bug in the dump badging command caused strings to be looked up in the
first loaded package only.
Bug:
64948230
Bug:
65645766
Test: none
Change-Id: Ia804777fe3f963004a5c053129ef6e0c94b7f6a3
Merged-In: Ia804777fe3f963004a5c053129ef6e0c94b7f6a3
Adam Lesinski [Thu, 24 Aug 2017 22:17:05 +0000 (15:17 -0700)]
AAPT2: Change the daemon mode to be line based
Accept a set of arguments separated by newlines.
This avoids path separator conflicts with the argument
format for passing splits.
Test: manual
Bug:
65645766
Change-Id: Ia68122cb77b7dde2292a0fd953e79f02996ac01c
Merged-In: Ia68122cb77b7dde2292a0fd953e79f02996ac01c
Izabela Orlowska [Thu, 24 Aug 2017 15:19:45 +0000 (16:19 +0100)]
AAPT2: better error handling for daemon mode
Test: manual
Bug:
65645766
Change-Id: Ia1997800ad94f386dbbb4195011395ecee1ba91f
Merged-In: Ia1997800ad94f386dbbb4195011395ecee1ba91f
Adam Lesinski [Sat, 19 Aug 2017 02:49:58 +0000 (19:49 -0700)]
AAPT2: Fix regression in Manifest.java permissions
Permissions defined with the same leaf name emit the same
string symbol, which causes collisions. AAPT would override
the symbol with the last one seen.
Do the same thing as AAPT, but emit a warning.
Bug:
64472942
Bug:
65645766
Test: make aapt2_tests
Change-Id: I17b9dc7e8d8bd80db98869394c93695cb453bebd
Merged-In: I17b9dc7e8d8bd80db98869394c93695cb453bebd
Adam Lesinski [Thu, 10 Aug 2017 22:37:28 +0000 (15:37 -0700)]
AAPT2: Define intermediate compiled XML proto
This proto format is meant to encapsulate more information
that is specific to Android and allows for easier validation
and manipulation across tools.
Test: make aapt2_tests
Bug:
65645766
Change-Id: I13bc34a460671fc0a36246be0d287a3d37d244d6
Merged-In: I13bc34a460671fc0a36246be0d287a3d37d244d6
Adam Lesinski [Tue, 25 Jul 2017 17:59:26 +0000 (10:59 -0700)]
AAPT2: Add a daemon mode
Gradle and other build tools that need to frequently interact with aapt2
can use the daemon mode to issue regular CLI commands without paying
the process start cost for each invocation.
Test: manual
Bug:
65645766
Change-Id: I543858ed46496278bad643f0dae688c924ec6c3f
Merged-In: I543858ed46496278bad643f0dae688c924ec6c3f