OSDN Git Service
TreeHugger Robot [Wed, 15 Mar 2017 07:16:40 +0000 (07:16 +0000)]
Merge "Enable cache clearing v2 logic, fix bugs."
Jeff Sharkey [Wed, 15 Mar 2017 05:37:35 +0000 (23:37 -0600)]
Enable cache clearing v2 logic, fix bugs.
Now that we have CTS tests to verify the cache clearing v2 logic,
we're ready to enable it!
Switch storage APIs over to "usable space" to match implementation
down in installd. Add a missing clearCallingIdentity(), and offer
better logging for missing appop permission.
Load quotas from disk right away at device boot instead of waiting.
Bug:
35685848,
35684969
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Change-Id: I8167e0322b4662ca6c975da5c50715e2d71332a7
TreeHugger Robot [Wed, 15 Mar 2017 04:30:27 +0000 (04:30 +0000)]
Merge "Apply static RRO"
TreeHugger Robot [Wed, 15 Mar 2017 04:24:25 +0000 (04:24 +0000)]
Merge "IP connectivity metrics: add new APF counters."
Hugo Benichi [Wed, 22 Feb 2017 04:02:27 +0000 (13:02 +0900)]
IP connectivity metrics: add new APF counters.
This patch adds a few missing counters to APF events:
- an actual lifetime duration to ApfProgramEvent.
- counters for total number of updates to ApfStatistics.
ApfProgramEvents are now recorded at program removal in order to
populate the actual lifetime of the program. ApfProgramEvents whose
actual lifetime was less than 1 second are filtered out.
Finally, instance fields of ApfProgramEvent and ApfStats classes are
made mutable to allow for simple record-like creation. This was not
possible when these classes were tagged @SystemApi.
Test: - manually verified output of $ dumpsys connmetrics list
- unit tests updated.
Bug:
34901696
Change-Id: I02694ebb9421ce1c2aa757fa6aa209d19a654dcd
Erik Kline [Wed, 15 Mar 2017 02:47:52 +0000 (02:47 +0000)]
Merge "Add comment with packet tracker debugging tip" am:
40aa5ee583 am:
17dd8723b7
am:
663269bae2
Change-Id: Iacf172a6b6e1b62bc84af8b5fcdd1745acfe987f
Erik Kline [Wed, 15 Mar 2017 02:43:19 +0000 (02:43 +0000)]
Merge "Add comment with packet tracker debugging tip" am:
40aa5ee583
am:
17dd8723b7
Change-Id: I1d937d99d58ae031d6bf86f3407669bf47d5c037
TreeHugger Robot [Wed, 15 Mar 2017 02:42:38 +0000 (02:42 +0000)]
Merge "Workaround for b/
36228253"
Erik Kline [Wed, 15 Mar 2017 02:38:51 +0000 (02:38 +0000)]
Merge "Add comment with packet tracker debugging tip"
am:
40aa5ee583
Change-Id: I0f5f139f81af23ddc33e37ddf489a477e37c394f
TreeHugger Robot [Wed, 15 Mar 2017 02:33:53 +0000 (02:33 +0000)]
Merge "Block modifying channel IDs of preview programs"
Adam Lesinski [Wed, 15 Mar 2017 02:30:34 +0000 (02:30 +0000)]
Merge "AAPT2: Add -A (assets) support"
Treehugger Robot [Wed, 15 Mar 2017 02:28:06 +0000 (02:28 +0000)]
Merge "Add comment with packet tracker debugging tip"
TreeHugger Robot [Wed, 15 Mar 2017 02:26:22 +0000 (02:26 +0000)]
Merge "fixed typos in log fixed bug
34845702 Test: manual"
TreeHugger Robot [Wed, 15 Mar 2017 01:49:26 +0000 (01:49 +0000)]
Merge "ZygoteInit: Remove CAP_SYS_RESOURCE"
TreeHugger Robot [Wed, 15 Mar 2017 01:45:27 +0000 (01:45 +0000)]
Merge "Fix the number of levels returned by getLevels()."
TreeHugger Robot [Wed, 15 Mar 2017 01:44:01 +0000 (01:44 +0000)]
Merge "Move rotation methods to DisplayContent"
Makoto Onuki [Wed, 15 Mar 2017 00:58:36 +0000 (17:58 -0700)]
Workaround for b/
36228253
Dynamic shortcuts must have target activities, but somehow the invariant
was broken.
Bug:
36228253
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Change-Id: I9163d57121f102d88baa3e34791877412719da50
TreeHugger Robot [Wed, 15 Mar 2017 01:03:50 +0000 (01:03 +0000)]
Merge "Decouple Dataset ids from SaveInfo."
TreeHugger Robot [Wed, 15 Mar 2017 01:03:19 +0000 (01:03 +0000)]
Merge changes from topic 'WifiDetails'
* changes:
Consolidate getRssi logic to return mRssi.
Necessary AccessPoint visibility change for WifiNetworkDetailsFragment.
TreeHugger Robot [Wed, 15 Mar 2017 01:00:26 +0000 (01:00 +0000)]
Merge "Permission enforcement for A11y volume changes"
TreeHugger Robot [Wed, 15 Mar 2017 00:57:08 +0000 (00:57 +0000)]
Merge "Restore TimePickerDialog#onClick behavior."
TreeHugger Robot [Wed, 15 Mar 2017 00:55:17 +0000 (00:55 +0000)]
Merge "Move out test utilities to a Testables library"
Andrii Kulian [Tue, 14 Mar 2017 18:11:47 +0000 (11:11 -0700)]
Move rotation methods to DisplayContent
This moves some of the rotation logic applied to displays
from WindowManagerService to DisplayContent. No changes in
logic.
Bug:
34242678
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testRotationNotAffectingSecondaryScreen
Test: android.server.cts.ActivityManagerAppConfigurationTests
Change-Id: Ica8b5d700dea82edfc6b51b10be3362fc89854b0
Adrian Roos [Tue, 14 Mar 2017 23:43:01 +0000 (23:43 +0000)]
Merge "Fix flakey KeyguardIndicationControllerTest"
Chris Craik [Tue, 14 Mar 2017 23:35:23 +0000 (23:35 +0000)]
Merge "Revert "Change behavior of setBitmap to cleanly reset the canvas - identity matrix - no save stack - wide-open clip""
Peter Qiu [Tue, 14 Mar 2017 23:21:43 +0000 (23:21 +0000)]
Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon" am:
6493f3df6b am:
7a3fd84b1e
am:
8ff8b498ca
Change-Id: Ia0c5c1876c2220b02f1e795700b07cf1088b531c
Peter Qiu [Tue, 14 Mar 2017 23:16:38 +0000 (23:16 +0000)]
Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon" am:
6493f3df6b
am:
7a3fd84b1e
Change-Id: I1cdba5a4bcca50a7c9e9983e95dd8ccb898f125e
Peter Qiu [Tue, 14 Mar 2017 23:07:28 +0000 (23:07 +0000)]
Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon"
am:
6493f3df6b
Change-Id: I40fc13a08425f2ada7e648342db92d83c4d59cba
TreeHugger Robot [Tue, 14 Mar 2017 23:01:10 +0000 (23:01 +0000)]
Merge "Don't wtf when rects are not available"
Felipe Leme [Fri, 10 Mar 2017 18:05:56 +0000 (10:05 -0800)]
Decouple Dataset ids from SaveInfo.
The FillResponse was automatically adding the AutofillId of all Datasets to
the SaveInfo object, but that would cause problems when the AutofillService
is not able to save some data (for example, if it comes from a read-only
backend).
Bug:
36076444
Test: OptionalSaveActivityTest pass
Test: m update-api
Change-Id: I1d5faaddf29e1be0f357438c8485e07caf975293
Treehugger Robot [Tue, 14 Mar 2017 22:45:56 +0000 (22:45 +0000)]
Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon"
Sundeep Ghuman [Mon, 13 Mar 2017 21:40:56 +0000 (14:40 -0700)]
Fix the number of levels returned by getLevels().
This was previously out of sync with WifiManager.RSSI_LEVELS which
caused UI issues where the wrong number of bars were shown in various
places. This is the permanent fix to a previous temporary fix.
Bug:
1948619
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: Iadb2a6131ee9fbc4f297766d0bc3bc82eca40a4d
Sundeep Ghuman [Thu, 9 Mar 2017 03:52:05 +0000 (19:52 -0800)]
Consolidate getRssi logic to return mRssi.
Changed previous getRssi method to updateeRssi in order to clarify
process, and also changed logic to return current mRssi when the given
AP is active. mRssi is set directly from WifiInfo for active networks.
For non-active networks we return the highest Rssi for any recently seen
BSSID (multiple APs with the same SSID are grouped together).
Change getSeen to updateSeen for consistency, although seen is never
used anywhere.
Also fixes b/
34889252.
Bug: b/
36077865
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: Ic52df41b8eb317e83d835c745b404007a53cf5d7
Sundeep Ghuman [Thu, 9 Mar 2017 00:18:29 +0000 (16:18 -0800)]
Necessary AccessPoint visibility change for WifiNetworkDetailsFragment.
Refactor constant name in WifiTracker for readability.
Bug:
34713316
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I41b0d69303d0452e2c2c22bcbddc34ae3932e99e
Tony Mantler [Tue, 14 Mar 2017 22:36:14 +0000 (22:36 +0000)]
Revert "Change behavior of setBitmap to cleanly reset the canvas - identity matrix - no save stack - wide-open clip"
https://buganizer.corp.google.com/issues/
36218535
This reverts commit
269f989fbf198b17994baf9141c4640aeaf34b4e.
Change-Id: Ib2473e4fce90c9abaa39eea2b77082ae26197b80
TreeHugger Robot [Tue, 14 Mar 2017 22:36:50 +0000 (22:36 +0000)]
Merge "Fix whitespace."
Romain Guy [Tue, 14 Mar 2017 22:28:04 +0000 (22:28 +0000)]
Merge "Use d=0.039 for Display P3 instead of sRGB's 0.04045"
Ammar Aijazi [Tue, 14 Mar 2017 22:20:11 +0000 (22:20 +0000)]
Merge "Add carrier config keys to control the data cycle."
Philip P. Moltmann [Tue, 14 Mar 2017 21:59:34 +0000 (21:59 +0000)]
Merge "Make it clear which type of AutoFillValue is set"
Kevin Chyn [Tue, 14 Mar 2017 19:31:17 +0000 (12:31 -0700)]
fixed typos in log
fixed bug
34845702
Test: manual
Change-Id: I6bb87d4a99b7af3c186c647cc1450c1d11e85f52
Signed-off-by: Kevin Chyn <kchyn@google.com>
TreeHugger Robot [Tue, 14 Mar 2017 21:46:33 +0000 (21:46 +0000)]
Merge "Add logging constants for settings search recent results."
Adrian Roos [Tue, 14 Mar 2017 20:10:25 +0000 (13:10 -0700)]
Fix flakey KeyguardIndicationControllerTest
The test in question would pass only when the device was
not charging, because the KeyguardIndicationController registers
itself with the KeyguardUpdateMonitor and shows indications when
the device starts charging.
Fixed by not registering the controller with the KeyguardUpdateMonitor
and instead driving the controller's callback directly.
Change-Id: I6828a97a36572be9e7520ce9a82afddf474d4008
Fixes:
36211361
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java -m transientIndication_releasesWakeLock_afterHidingDelayed
Jason Monk [Wed, 8 Mar 2017 19:57:56 +0000 (14:57 -0500)]
Move out test utilities to a Testables library
Test: runtest --path frameworks/base/tests/testablets/tests
&& runtest systemui
Change-Id: Ideef4aef5f26136b1741c556b9be5884f38842a0
Ajay Panicker [Tue, 14 Mar 2017 21:17:04 +0000 (21:17 +0000)]
resolve merge conflicts of
4b39c15da0f5 to nyc-mr2-dev-plus-aosp
am:
ab96721a57
Change-Id: Ic0a1f260ce6254fe935a4c6e30f93823aa5eea98
TreeHugger Robot [Tue, 14 Mar 2017 21:14:41 +0000 (21:14 +0000)]
Merge "Fix fingerprint navigation after entering lockout."
Philip P. Moltmann [Tue, 14 Mar 2017 21:13:08 +0000 (21:13 +0000)]
Merge "Change autoFillHint to list of strings"
Felipe Leme [Tue, 14 Mar 2017 21:09:04 +0000 (21:09 +0000)]
Merge "Fixed obsolete TODOs."
Ajay Panicker [Tue, 14 Mar 2017 21:01:57 +0000 (14:01 -0700)]
resolve merge conflicts of
4b39c15da0f5 to nyc-mr2-dev-plus-aosp
Change-Id: I7567db6d1fbb9f8a8b5e29c3e24cdff6508c4b6f
TreeHugger Robot [Tue, 14 Mar 2017 20:26:33 +0000 (20:26 +0000)]
Merge "Use SkColorSpace::isSRGB() in place of pointer comparison"
Doris Ling [Tue, 14 Mar 2017 20:20:36 +0000 (20:20 +0000)]
Merge "Update sort order for settings category tiles."
Selim Cinek [Tue, 14 Mar 2017 20:11:07 +0000 (20:11 +0000)]
Merge "Fixed that indents on an ellipsis of a staticlayout were dropped"
TreeHugger Robot [Tue, 14 Mar 2017 20:03:04 +0000 (20:03 +0000)]
Merge "Don't provide Build.Serial to apps targeting v2 sandbox"
TreeHugger Robot [Tue, 14 Mar 2017 19:46:23 +0000 (19:46 +0000)]
Merge "Explicitly disallow Instant App admins"
TreeHugger Robot [Tue, 14 Mar 2017 19:45:02 +0000 (19:45 +0000)]
Merge "Excluded Views don't go through Transition."
Marie Janssen [Tue, 14 Mar 2017 19:29:50 +0000 (19:29 +0000)]
Merge commit '
faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c am:
4034a9a96a am:
89d2b46a4a
am:
c1a5939026
Change-Id: I50df57c208542d35bc72851fa37e47731bbd9965
TreeHugger Robot [Tue, 14 Mar 2017 19:27:15 +0000 (19:27 +0000)]
Merge "Renamed ViewStructure.setSanitized() to setDataIsSensitive()."
Adam Lesinski [Mon, 13 Mar 2017 18:40:48 +0000 (11:40 -0700)]
AAPT2: Add -A (assets) support
Looks like the build system doesn't support assets/ for
resources, so we will re-introduce them in aapt2, even though
we're just copying them around and they would be better
suited for inclusion in the APK when classes.dex gets inserted.
Bug:
35461578
Test: CTS test android.content.res.cts.AssetManager#testAssetOperations should pass
Change-Id: I18361d7367d476806bcf7154ee76df3f0e83b565
Marie Janssen [Tue, 14 Mar 2017 19:21:49 +0000 (19:21 +0000)]
Merge commit '
faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c am:
4034a9a96a
am:
89d2b46a4a
Change-Id: I5f710900167558283cb9e898c2022d8991dbb5c3
Svetoslav Ganov [Tue, 14 Mar 2017 19:18:26 +0000 (19:18 +0000)]
Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked" am:
14c7e67da8 am:
6006d681ab
am:
5cd3bb93ce
Change-Id: Iee29739716cd7a264196d0999ada7d4399b30a3e
Marie Janssen [Tue, 14 Mar 2017 19:16:47 +0000 (19:16 +0000)]
Merge commit '
faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c
am:
4034a9a96a
Change-Id: Ie63f9d24ab37c5465b250d2b9b60efdf736b4d60
Jeff Sharkey [Tue, 14 Mar 2017 19:16:43 +0000 (19:16 +0000)]
Merge "Allow querying for apps on adopted storage."
Jorim Jaggi [Tue, 14 Mar 2017 19:15:59 +0000 (20:15 +0100)]
Don't wtf when rects are not available
No reason to freak out about this - this isn't that dramatic such
that it should affect our system stability metrics.
Test: Boot device
Bug:
35633644
Change-Id: I70f4303b315376f6c80edd199473b9218f718a8c
Roozbeh Pournader [Tue, 14 Mar 2017 19:15:25 +0000 (19:15 +0000)]
Merge "Add 25 Noto fonts for historic scripts to fonts.xml"
Svetoslav Ganov [Tue, 14 Mar 2017 19:12:23 +0000 (19:12 +0000)]
Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked" am:
14c7e67da8
am:
6006d681ab
Change-Id: I9ed4aca6b9d23a4e8196bdb9595c5e1b8fd2faf4
Dmitry Dementyev [Tue, 14 Mar 2017 19:10:32 +0000 (19:10 +0000)]
Merge "Use opPackageName to filter accounts in getAccountsAsUserForPakage method."
Svetoslav Ganov [Tue, 14 Mar 2017 19:07:22 +0000 (19:07 +0000)]
Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked"
am:
14c7e67da8
Change-Id: Icfa9fc501806820545dd9df9d671fcdfe645b73f
Svetoslav Ganov [Tue, 14 Mar 2017 18:58:28 +0000 (18:58 +0000)]
Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked"
Nick Kralevich [Tue, 14 Mar 2017 17:25:35 +0000 (10:25 -0700)]
ZygoteInit: Remove CAP_SYS_RESOURCE
Please see commit
3082eb7c7253c62a06aa151a80487a4eabd49914 for an
explanation of this change.
This capability is not used by system_server.
Bug:
34951864
Test: code compiles, device boots, no selinux errors ever reported.
Change-Id: I4242b1abaa8679b9bfa0d31a1df565b46b7b3cc3
TreeHugger Robot [Tue, 14 Mar 2017 18:28:29 +0000 (18:28 +0000)]
Merge "ZygoteInit: remove duplicate preloadOpenGL call"
Calin Juravle [Tue, 14 Mar 2017 18:02:31 +0000 (18:02 +0000)]
Merge "Add missing return in DexManager"
Felipe Leme [Tue, 14 Mar 2017 01:05:22 +0000 (18:05 -0700)]
Renamed ViewStructure.setSanitized() to setDataIsSensitive().
Bug:
36126001
Test: CtsAutoFillServiceTestCases pass
Test: m update-api
Change-Id: I182355b63d8743cd8cd8612f29a9269e258283c2
Ammar Aijazi [Wed, 18 Jan 2017 01:32:15 +0000 (17:32 -0800)]
Add carrier config keys to control the data cycle.
Adds the following keys: KEY_MONTHLY_DATA_CYCLE_DAY,
KEY_DATA_WARNING_THRESHOLD, and KEY_DATA_LIMIT_THRESHOLD.
This allows carrier apps to control the monthly data cycle reset date,
as well as fill in data warnings and limits based on plan details.
Bug: b/
34385985
Test: No explicit tests for the API additions, but will add tests to the
follow up review which adds functionality that depends on these fields.
Change-Id: I2aee5cdbc4b707e28062830f1143c694ccae13cd
Fan Zhang [Tue, 14 Mar 2017 00:46:24 +0000 (17:46 -0700)]
Add logging constants for settings search recent results.
Bug:
27391895
Test: builds
Change-Id: I20763eb51e80a9b54a5cfc22cb3a640a7bc3c800
Fan Zhang [Mon, 13 Mar 2017 22:25:54 +0000 (15:25 -0700)]
Add logging constants for settings
- New constants for logging app details page button clicks
- New constants for logging search result clicks
Change-Id: Ib2d1f1cec656881941a43363cbcb6c57395a7766
Fix:
32798201
Fix:
32652772
Test: Builds
Marie Janssen [Tue, 14 Mar 2017 17:09:52 +0000 (10:09 -0700)]
Merge commit '
faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c
Change-Id: I2b9aeca138aefb0579b3be8014b3f0bf49d99764
Jorim Jaggi [Tue, 14 Mar 2017 17:09:07 +0000 (17:09 +0000)]
Merge "Fix multi-dimen app transition delay tron event"
Jeff Sharkey [Tue, 14 Mar 2017 17:02:33 +0000 (11:02 -0600)]
Allow querying for apps on adopted storage.
Apps that live on adopted storage devices appear to be uninstalled
while ejected. They're technically still valid apps, with allocated
UIDs, so use MATCH_UNINSTALLED_PACKAGES when querying for their
details.
Test: builds, boots
Bug:
36177795
Change-Id: Ia7ed5f0462b1f47609ea8e1ace6fa145e0b5602c
Android Build Merger (Role) [Tue, 14 Mar 2017 16:53:19 +0000 (16:53 +0000)]
Merge changes from topic 'am-
660d5927634e486aa0191f76b8cbb641'
* changes:
Merge changes from topics 'Passpoint API update', 'Passpoint intent update' am:
5df03b3d74 am:
39df78ecc7 am:
b81a0cb340 -s ours
hotspot2: hide validate method for Passpoint configuration am:
b5ca6f36b5 am:
9c0f6f3db7 am:
a21dbef5fb -s ours
Osu: temporarily comment out the usage of deprecated intent definitions am:
06b63dcb9f am:
de91bfd277 am:
ff5be641ad -s ours
hotspot2: update Passpoint intent definitions am:
5679145d9a am:
c4d5850d3e am:
d26acda230 -s ours
TreeHugger Robot [Tue, 14 Mar 2017 16:51:41 +0000 (16:51 +0000)]
Merge "Small cleanup or DataStore API javadoc."
Peter Qiu [Tue, 14 Mar 2017 16:50:56 +0000 (16:50 +0000)]
Merge changes from topics 'Passpoint API update', 'Passpoint intent update' am:
5df03b3d74 am:
39df78ecc7
am:
b81a0cb340 -s ours
Change-Id: I5aca05099b7ab41885723d5da286747f2a8b6489
Peter Qiu [Tue, 14 Mar 2017 16:49:49 +0000 (16:49 +0000)]
hotspot2: hide validate method for Passpoint configuration am:
b5ca6f36b5 am:
9c0f6f3db7
am:
a21dbef5fb -s ours
Change-Id: Ica3501876b945d8546164f591571ccd926fc33f6
Peter Qiu [Tue, 14 Mar 2017 16:48:51 +0000 (16:48 +0000)]
Osu: temporarily comment out the usage of deprecated intent definitions am:
06b63dcb9f am:
de91bfd277
am:
ff5be641ad -s ours
Change-Id: I4f8c9b6cf747301facd81450a040a32cd0c94114
Peter Qiu [Tue, 14 Mar 2017 16:47:10 +0000 (16:47 +0000)]
hotspot2: update Passpoint intent definitions am:
5679145d9a am:
c4d5850d3e
am:
d26acda230 -s ours
Change-Id: I3abffe7b4b14f3a451017594fcb9ab057a4a082f
Peter Qiu [Tue, 14 Mar 2017 16:36:20 +0000 (16:36 +0000)]
Merge changes from topics 'Passpoint API update', 'Passpoint intent update' am:
5df03b3d74
am:
39df78ecc7
Change-Id: I5c86f4dd87a369640248a3fdd953912f0d92e8f4
Peter Qiu [Tue, 14 Mar 2017 16:35:20 +0000 (16:35 +0000)]
hotspot2: hide validate method for Passpoint configuration am:
b5ca6f36b5
am:
9c0f6f3db7
Change-Id: I4c4b6f107b4cb603c6ab3f356e25eed8c0f18c33
Peter Qiu [Tue, 14 Mar 2017 16:34:19 +0000 (16:34 +0000)]
Osu: temporarily comment out the usage of deprecated intent definitions am:
06b63dcb9f
am:
de91bfd277
Change-Id: Ibab3d0b8900bcfdea8145a23bb2f7694bbc37700
Peter Qiu [Tue, 14 Mar 2017 16:32:45 +0000 (16:32 +0000)]
hotspot2: update Passpoint intent definitions am:
5679145d9a
am:
c4d5850d3e
Change-Id: I28c59915fdd7215ea66b1a2ce9181d7d2890ae9f
Nick Kralevich [Tue, 14 Mar 2017 16:25:40 +0000 (09:25 -0700)]
ZygoteInit: remove duplicate preloadOpenGL call
Commit
ba0370eef3d17baa70d43723e96eb135c8e4ed58 added a call to
preloadOpenGL(), The nyc-mr2-dev cherrypick of that same commit
(
b3a1417663d64fe003b03c97e2f24b6eeba3f9dc) was improperly handled
by the automerger and added yet another call to preloadOpenGL().
Remove the duplicate call.
Test: code compiles.
Change-Id: Ie2a1c73155197506ee9571f2c05988c77a750281
Peter Qiu [Tue, 14 Mar 2017 16:24:11 +0000 (16:24 +0000)]
Merge changes from topics 'Passpoint API update', 'Passpoint intent update'
am:
5df03b3d74
Change-Id: Ic1822a3203da5522a5a103c34fb45a6498cd6428
Peter Qiu [Tue, 14 Mar 2017 16:22:28 +0000 (16:22 +0000)]
hotspot2: hide validate method for Passpoint configuration
am:
b5ca6f36b5
Change-Id: I268b0db6c844ec1746b6374c87768f233b719b3f
Peter Qiu [Tue, 14 Mar 2017 16:21:06 +0000 (16:21 +0000)]
Osu: temporarily comment out the usage of deprecated intent definitions
am:
06b63dcb9f
Change-Id: I6c418dbecc72ac5c4e245fff06fabfe23b443c23
Peter Qiu [Tue, 14 Mar 2017 16:19:19 +0000 (16:19 +0000)]
hotspot2: update Passpoint intent definitions
am:
5679145d9a
Change-Id: I4e59efbcd9a9d33ceac8cc359155770c2de5a0fd
Geoffrey Pitsch [Tue, 14 Mar 2017 16:15:29 +0000 (16:15 +0000)]
Merge "@Ignore for KeyguardControllerTest"
Philip P. Moltmann [Thu, 9 Mar 2017 21:19:55 +0000 (13:19 -0800)]
Make it clear which type of AutoFillValue is set
throw and handle errors if the wrong value is set for a view
Test: android.autofillservice.cts.AutofillValueTest
Change-Id: Ida80da7913a210bede6c47d6b7a6f215a012a84c
Treehugger Robot [Tue, 14 Mar 2017 16:07:46 +0000 (16:07 +0000)]
Merge changes from topics 'Passpoint API update', 'Passpoint intent update'
* changes:
hotspot2: update Passpoint configuration management APIs
hotspot2: hide validate method for Passpoint configuration
Osu: temporarily comment out the usage of deprecated intent definitions
hotspot2: update Passpoint intent definitions
Marie Janssen [Tue, 14 Mar 2017 16:01:07 +0000 (16:01 +0000)]
Merge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast" into nyc-dev
Jorim Jaggi [Tue, 14 Mar 2017 15:46:50 +0000 (15:46 +0000)]
Merge "Add transform info to dump output"
Felipe Leme [Tue, 14 Mar 2017 15:40:06 +0000 (08:40 -0700)]
Fixed obsolete TODOs.
Test: not needed
Bug:
35395043
Bug:
26742218
Change-Id: I0e5adb574610374055a6546b66529a7aed7cc413
Dmitri Plotnikov [Tue, 14 Mar 2017 15:28:11 +0000 (15:28 +0000)]
Merge "Enabling bugreport notifications on TV"
Jorim Jaggi [Fri, 3 Feb 2017 01:13:05 +0000 (17:13 -0800)]
Fix multi-dimen app transition delay tron event
Make sure to log everything.
Test: Open app, inspect log.
Test: com.android.systemmetrics.functional.AppStartTests
Bug:
33086172
Change-Id: I6fdfef625c09267dcf20724e853cf7471abc86c9