OSDN Git Service
Bryce Lee [Fri, 18 Aug 2017 21:33:46 +0000 (21:33 +0000)]
Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev
TreeHugger Robot [Fri, 18 Aug 2017 20:50:07 +0000 (20:50 +0000)]
Merge "Avoid potential reboot loop due to package cache" into oc-mr1-dev
Pankaj Kanwar [Fri, 18 Aug 2017 20:23:08 +0000 (20:23 +0000)]
Merge "Building IMSI encryption support." into oc-mr1-dev
TreeHugger Robot [Fri, 18 Aug 2017 18:18:57 +0000 (18:18 +0000)]
Merge "Exclude autogrouping from rate limiter" into oc-mr1-dev
Makoto Onuki [Fri, 18 Aug 2017 18:00:19 +0000 (11:00 -0700)]
Avoid potential reboot loop due to package cache
Bug:
64295061
Test: Boot (write package cache) and reboot (read package cache)
Change-Id: I5de712c9666bac71ff6121001163ebc90c4b62d0
TreeHugger Robot [Fri, 18 Aug 2017 17:55:46 +0000 (17:55 +0000)]
Merge "Clean up binding list on error" into oc-mr1-dev
TreeHugger Robot [Fri, 18 Aug 2017 17:37:12 +0000 (17:37 +0000)]
Merge "AOD: Fix LockIcon click handler" into oc-mr1-dev
pkanwar [Tue, 4 Jul 2017 23:04:44 +0000 (16:04 -0700)]
Building IMSI encryption support.
Added additional error checks while returning the key.
Create config parameter:
1. IMSI_KEY_AVAILABILITY_INT.
BUG:
35606429
Test: manual
Change-Id: Iaa5fed3b51719679051626081d82b85a04128896
TreeHugger Robot [Fri, 18 Aug 2017 16:24:43 +0000 (16:24 +0000)]
Merge "LockSettings: Enforce permission check on havePattern/havePassword/systemReady" into oc-mr1-dev
Julia Reynolds [Fri, 18 Aug 2017 13:22:40 +0000 (09:22 -0400)]
Exclude autogrouping from rate limiter
To prevent concurrent updates from the app from
being dropped
Test: cts, notificationmanagertest
Change-Id: Id5047b04644599a862f1b6d2a340bc79ad761f9f
Fixes:
64804822
Julia Reynolds [Fri, 18 Aug 2017 13:21:36 +0000 (09:21 -0400)]
Clean up binding list on error
So that we can try again
Test: manual
Change-Id: I6be1e8d0377930d52c599261a7381c1e377cbcfc
Fixes:
64458792
Hugo Benichi [Fri, 18 Aug 2017 11:46:22 +0000 (11:46 +0000)]
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" into oc-mr1-dev
TreeHugger Robot [Fri, 18 Aug 2017 03:17:48 +0000 (03:17 +0000)]
Merge "Add Audio effect session intent to config file" into oc-mr1-dev
Bryce Lee [Fri, 18 Aug 2017 02:04:17 +0000 (02:04 +0000)]
Merge "Only update reported configuration when triggered from AM side." into oc-mr1-dev
Nathan Harold [Fri, 18 Aug 2017 01:59:06 +0000 (01:59 +0000)]
Merge "Cleanup ServiceState.toString()" into oc-mr1-dev
TreeHugger Robot [Fri, 18 Aug 2017 01:27:54 +0000 (01:27 +0000)]
Merge "If an Activity transitions to VR, then ensure it's in the main stack." into oc-mr1-dev
Seigo Nonaka [Fri, 18 Aug 2017 01:02:38 +0000 (01:02 +0000)]
Merge "Fix race condition of removing surface." into oc-dev am:
07a21754f4 -s ours
am:
688a98b415 -s ours
Change-Id: I50b69d1f061d62e8441816dc70a7bdcdf97d53d3
Seigo Nonaka [Fri, 18 Aug 2017 00:49:08 +0000 (00:49 +0000)]
Merge "Fix race condition of removing surface." into oc-dev
am:
07a21754f4 -s ours
Change-Id: Ic850275cc7f81629adcc5081ec9f137e531b9495
TreeHugger Robot [Fri, 18 Aug 2017 00:40:55 +0000 (00:40 +0000)]
Merge "Fix race condition of removing surface." into oc-dev
TreeHugger Robot [Fri, 18 Aug 2017 00:30:13 +0000 (00:30 +0000)]
Merge "Bluetooth: Fix startAdvertisingSet error handling" into oc-mr1-dev
Christopher Tate [Fri, 18 Aug 2017 00:24:09 +0000 (17:24 -0700)]
Add Audio effect session intent to config file
Currently audio effect panel can't receive session
intent if app targetSdkVersion is Android O or later.
Because the intent is limited on background.
However this kind of application needs to receive
the intent when application plays music.
Bug:
62777192
Test: manual
Cherrypick of partner CL 870245
Change-Id: Ibcebb938fa9177a9b0a7be079b1c7374ba9424ee
TreeHugger Robot [Fri, 18 Aug 2017 00:16:46 +0000 (00:16 +0000)]
Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails" into oc-mr1-dev
TreeHugger Robot [Fri, 18 Aug 2017 00:15:31 +0000 (00:15 +0000)]
Merge "Add LOCATION_HARDWARE permission to Rtt API." into oc-mr1-dev
Casey Burkhardt [Thu, 17 Aug 2017 23:50:43 +0000 (23:50 +0000)]
Merge "Make isAccessibilityButtonSupported public" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 23:45:05 +0000 (23:45 +0000)]
Merge "Fix error message strings" into oc-mr1-dev
Siyamed Sinir [Thu, 17 Aug 2017 23:39:10 +0000 (23:39 +0000)]
Merge "Fix email auto link when there are two chars in local part" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 23:37:56 +0000 (23:37 +0000)]
Merge "Modified the vibration of the notification panel" into oc-mr1-dev
Bryan Eyler [Thu, 17 Aug 2017 23:31:10 +0000 (23:31 +0000)]
Merge "Add user selection to car status bar and animate." into oc-mr1-dev
Julia Reynolds [Thu, 17 Aug 2017 23:13:29 +0000 (23:13 +0000)]
Merge "Let the foreground service channel be blocked" into oc-dr1-dev
am:
6614a2e5d0
Change-Id: Ic155670df78a6e779174cbd705f07260c8d305b6
TreeHugger Robot [Thu, 17 Aug 2017 23:03:35 +0000 (23:03 +0000)]
Merge "Let the foreground service channel be blocked" into oc-dr1-dev
Santos Cordon [Fri, 21 Jul 2017 23:15:13 +0000 (16:15 -0700)]
If an Activity transitions to VR, then ensure it's in the main stack.
Bug:
62791734
Test: Manual. From VR, start an app that sets VR dynamically via
Activity.setVrModeEnabled. Ensure it transitions from virtual display
to main display via added logging and 'adb shell am stack list'.
Change-Id: I11c1aad09e41666b928a6c2d896f9f2e22bb1aa5
Bryce Lee [Thu, 17 Aug 2017 22:37:26 +0000 (15:37 -0700)]
Don't resume activity if user is locked and encryption is unsupported
Previously we were not checking if to see if this condition was met
when determining the top running activity. As a result we could get
in a loop where we force stop the process since the app doesn't
support encryption yet try to start it again due to the
ActivityRecord being on top.
This changelist addresses the issue by checking this condition when
determining whether it is okay to show.
Change-Id: I868f97ce8b3ea4220019b8570407e33f27ea88bc
Fixes:
64259425
Test: go/wm-smoke
Android Build Merger (Role) [Thu, 17 Aug 2017 22:35:10 +0000 (22:35 +0000)]
Merge "Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am:
0c2b2d1f87 -s ours am:
c9a9fcdcd3 -s ours am:
273bd3b67f -s ours" into oc-mr1-dev
Jakub Pawlowski [Thu, 17 Aug 2017 14:19:12 +0000 (07:19 -0700)]
Bluetooth: Fix startAdvertisingSet error handling
Calls to old advertising API (startAdvertising), should never throw
exceptions. Instead, it used to post failure callback. This behaviour
was accidentally modified when implementing new API. Right now, instead
of posting error callback, we throw IllegalArgumentException if we fail
to obtain BluetoothGatt object, or the call to startAdvertisingSet
fails.
This patch brings back the old behaviour to the API. It also makes new
API post callback instead of throwing exception in this error case.
Bug:
63819108
Test: manual
Change-Id: I897b99839f899ca3f3dc609918d665c8c327b777
Merged-In: I897b99839f899ca3f3dc609918d665c8c327b777
(cherry picked from commit
f7bd6b26c73b7ea0bbfd00b75c23895eca281aff)
Jakub Pawlowski [Thu, 17 Aug 2017 13:15:43 +0000 (06:15 -0700)]
Bluetooth: Don't throw exception when stopAdvertisingSet fails
When advertising is stopped while Bluetooth is disabled, we should not
throw any exceptions, just log the failure.
This was the default behaviour before the AdvertisingSet was introduced.
Bug:
63819108
Test: manual
Change-Id: I518e071b77b127973aee6f24fa6ced4f28bc9531
Merged-In: I518e071b77b127973aee6f24fa6ced4f28bc9531
(cherry picked from commit
f73863dc29c5adc70117649d24f9b65f6b3232be)
Hugo Benichi [Thu, 17 Aug 2017 22:31:59 +0000 (22:31 +0000)]
Merge "Add convenience methods to IpPrefix and LinkAddress" into oc-mr1-dev
Tony Mak [Thu, 17 Aug 2017 22:31:04 +0000 (22:31 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am:
0c2b2d1f87 -s ours am:
c9a9fcdcd3 -s ours
am:
273bd3b67f -s ours
Change-Id: Ib1734b1826e29143bdf7b4d0d9c8acfe9f259ad7
Tony Mak [Thu, 17 Aug 2017 22:23:15 +0000 (22:23 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am:
0c2b2d1f87 -s ours
am:
c9a9fcdcd3 -s ours
Change-Id: I453d676952f885b1fc4afc21c0c11a17ae0bb90c
TreeHugger Robot [Thu, 17 Aug 2017 22:21:28 +0000 (22:21 +0000)]
Merge "Wifi connection hysteresis" into oc-mr1-dev
Tony Mak [Thu, 17 Aug 2017 22:07:36 +0000 (22:07 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev
am:
0c2b2d1f87 -s ours
Change-Id: Id0fe09b6f6ba687b6597ce2f97b6b8d83fbc4915
TreeHugger Robot [Thu, 17 Aug 2017 21:56:52 +0000 (21:56 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev
Wei Wang [Wed, 16 Aug 2017 18:54:27 +0000 (11:54 -0700)]
Add LOCATION_HARDWARE permission to Rtt API.
Test: Manual
Bug:
62264080
Bug:
62344058
Change-Id: I00744a046c0fdcccd2f10924a70d816372e49fa4
Selim Cinek [Wed, 16 Aug 2017 21:49:10 +0000 (14:49 -0700)]
Modified the vibration of the notification panel
The vibrations are now gated by "Vibrate on Tap"
This also moves the vibration on expansion to a
tick instead of a click.
Also improved the performance, such that vibrations
are now happening on the background thread instead
of the foreground.
Fixes:
64600716
Fixes:
64121575
Test: manual, observe vibrations when expanding / scrolling
Change-Id: I5099287adacc0f916941fd77e97948b9fa16ad09
Bryan Eyler [Tue, 8 Aug 2017 23:53:33 +0000 (16:53 -0700)]
Add user selection to car status bar and animate.
Adds the UserGridView to the car status bar and adds an animation when
expanding/hiding.
Bug:
63593747
Tested on Mojave with the fullscreen user switcher and status bar.
Change-Id: If6ddbd4da896c5eb661393dcc35ab299361754e9
TreeHugger Robot [Thu, 17 Aug 2017 18:38:04 +0000 (18:38 +0000)]
Merge "Don't call surface.remove if surface is null." into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 18:28:57 +0000 (18:28 +0000)]
Merge "AOD: Delay removing AOD scrim after pulse" into oc-mr1-dev
Julia Reynolds [Thu, 17 Aug 2017 17:34:27 +0000 (13:34 -0400)]
Let the foreground service channel be blocked
And update the channel name
Change-Id: Ic4b909d31b38b9e1ee05f9b3e4e5c91efc6752b1
Fixes:
36891897
Test: manual
Jordan Liu [Tue, 8 Aug 2017 23:06:17 +0000 (16:06 -0700)]
Fix error message strings
mmcc_imsi_unknown_in_hlr and mmcc_illegal_ms are updated to reflect
newly supported requirements.
Fixes:
64194949
Test: manual
Change-Id: I358ba1d562d30e958580003336ace3941bd5e04f
Merged-In: I358ba1d562d30e958580003336ace3941bd5e04f
Bryce Lee [Thu, 17 Aug 2017 16:16:03 +0000 (09:16 -0700)]
Only update reported configuration when triggered from AM side.
Previously we were updating the last reported Configuration whenever
it was reported to WM. However, the original intention of last
reported Configuration was reporting from AM side to the
ActivityRecord, not AM to WM. Updating this value in the latter case
leads to scenarios where we may update the Configuration too soon,
compromising any logic relying on comparing against the truly last
reported value.
This changelist removes call points other than messaging from the AM
side which change this value. It also consolidates all changes to the
method ActivityRecord#setLastReportedConfiguration to better track
where the value is being set.
Change-Id: I958daf6cd2f2163637f8b7e567a0f3e2be540b7d
Fixes:
63813517
Test: go/wm-smoke
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAppConfigurationTests
TreeHugger Robot [Thu, 17 Aug 2017 18:04:40 +0000 (18:04 +0000)]
Merge "Reduced the retry after disconnect delay" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 18:00:03 +0000 (18:00 +0000)]
Merge "Hide subtitle for dialog from QS when applicable" into oc-mr1-dev
Siyamed Sinir [Fri, 11 Aug 2017 15:31:05 +0000 (16:31 +0100)]
Fix email auto link when there are two chars in local part
Email auto linking used to accept either a single char or more than 2
chars in the local part. Updated the regular expression to accept 1 or
more chars.
Test: added test to cts.LinkifyTest
Test: bit -t CtsTextTestCases:android.text.util.cts.LinkifyTest
Test: bit -t FrameworksCoreTests:android.util.PatternsTest
Test: bit -t FrameworksCoreTests:android.text.util.LinkifyTest
Test: bit -t CtsWidgetTestCases:android.widget.cts.TextViewTest
Bug:
64467661
Change-Id: I4e28a344ff1bc50da353b9490eaaec99a751bffb
(cherry picked from commit
e17c5b478e2446154288d658ef4099a722809dc7)
Sudheer Shanka [Thu, 17 Aug 2017 17:12:05 +0000 (17:12 +0000)]
Merge "Update standby firewall rules when an app came out of standby mode." into oc-mr1-dev
Bryce Lee [Thu, 17 Aug 2017 17:11:52 +0000 (17:11 +0000)]
Merge "Add back support for force resize developer option." into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 17:09:13 +0000 (17:09 +0000)]
Merge "Make default brightness ramp rates multiples of 60." into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 17:08:33 +0000 (17:08 +0000)]
Merge "Small fix to pm dumpsys formatting." into oc-mr1-dev
Hall Liu [Thu, 17 Aug 2017 16:17:53 +0000 (16:17 +0000)]
Merge "Do not throw IOException from RttCall.read()" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 16:02:54 +0000 (16:02 +0000)]
Merge "Fixed NPE when cancellation signal is null." into oc-mr1-dev
Adrian Roos [Thu, 17 Aug 2017 15:58:26 +0000 (17:58 +0200)]
LockSettings: Enforce permission check on havePattern/havePassword/systemReady
Also adds SafetyNet logging for attempted unauthorized access.
Change-Id: I7c5226ead332d015045dd1af6afe0e59257f0d89
Fixes:
28251513
Test: Verify everything still works; "adb shell service call locksettings 13" (and 14,20) must return a security exception.
TreeHugger Robot [Thu, 17 Aug 2017 15:54:52 +0000 (15:54 +0000)]
Merge changes I36636687,I4c45f787 into oc-mr1-dev
* changes:
Doc updates
Translate default channel on locale change
Adrian Roos [Thu, 17 Aug 2017 15:29:19 +0000 (17:29 +0200)]
AOD: Fix LockIcon click handler
Fixes an issue where the click action of the LockIcon was inconsistently
handled:
- clickable if touch exploration or trust agent is active
- click action is unlock if accessibility enabled
This lead to a bug where unlocking with an accessibility service on that icon
was not possible unless a trust agent or touch exploration was enabled.
Change-Id: I3141afb8ed7ed5a07481f6ae35477f0e11cc5b02
Fixes:
37363764
Test: Enable accessibility and trust agent, verify click disables trust instead of unlocking.
Daniel Sandler [Thu, 17 Aug 2017 14:32:40 +0000 (14:32 +0000)]
Merge changes from topic "revert-injectors" into oc-mr1-dev
* changes:
Revert "Add API to allow apps more control over instantiation"
Revert "Add plugin to swap out recents"
Adrian Roos [Thu, 17 Aug 2017 14:10:31 +0000 (16:10 +0200)]
AOD: Delay removing AOD scrim after pulse
Fixes an issue where pulse scrim was lifted before the power state got applied
to the display, resulting in a flicker.
Change-Id: Id06a24414af724db616292a50210b5f55345079b
Fixes:
64077859
Test: Receive notification on AOD, swipe away, verify no flicker.
Casey Burkhardt [Thu, 17 Aug 2017 09:50:45 +0000 (02:50 -0700)]
Make isAccessibilityButtonSupported public
Bug:
62342696
Test: Builds
Change-Id: I02082f2db349181473b2a7fd367fc8892d495fc1
TreeHugger Robot [Thu, 17 Aug 2017 09:06:57 +0000 (09:06 +0000)]
Merge "Tell the system when tethering offload hits a limit." into oc-mr1-dev
Charles He [Thu, 17 Aug 2017 07:54:05 +0000 (07:54 +0000)]
Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev
Lorenzo Colitti [Tue, 15 Aug 2017 10:25:51 +0000 (19:25 +0900)]
Tell the system when tethering offload hits a limit.
Add a new tetherLimitReached method to INetworkManagementService,
and call it when the HAL notifies OffloadController because the
limit has been reached.
Bug:
29337859
Bug:
32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I0304e555544ee18c83244672766c767cbad650a1
Dianne Hackborn [Thu, 17 Aug 2017 05:58:47 +0000 (05:58 +0000)]
Maps crashed entering PIP right after...
am:
598c497be3 -s ours
Change-Id: Id0998230a13bd257c54b078e9d4ba42943a42db0
Dianne Hackborn [Mon, 31 Jul 2017 20:56:02 +0000 (13:56 -0700)]
Maps crashed entering PIP right after...
...beginning navigation
Bug:
64140901
Test: booted and ran and posted notifications.
Merged-In:I8c9173dab2716b901cc6dd66f0b0d18cae33f298
Change-Id: I8c9173dab2716b901cc6dd66f0b0d18cae33f298
(cherry picked from commit
52195a66311d79a2f57e8112db86d48ed15bf915)
Sudheer Shanka [Thu, 17 Aug 2017 04:49:04 +0000 (04:49 +0000)]
Merge "Fix and enable ConnOnActivityStartTest." into oc-mr1-dev
Vineeta Srivastava [Thu, 17 Aug 2017 03:15:32 +0000 (03:15 +0000)]
Merge "Add new "fast" filter for ambient light." into oc-dr1-dev
am:
c6349f3943
Change-Id: I85a0971fe3c33f533a1758e8b604b7b1ade2b470
Vineeta Srivastava [Thu, 17 Aug 2017 03:07:47 +0000 (03:07 +0000)]
Merge "Add new "fast" filter for ambient light." into oc-dr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 03:07:02 +0000 (03:07 +0000)]
Merge "Revert "Dismiss Autofill Save UI when a new Activity is launched."" into oc-mr1-dev
Jeff Davidson [Thu, 17 Aug 2017 02:53:43 +0000 (02:53 +0000)]
Merge "Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public." into oc-mr1-dev
Svetoslav Ganov [Thu, 17 Aug 2017 02:44:01 +0000 (02:44 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev am:
357f42bf69
am:
2800f22eec -s ours
Change-Id: I767ece0ec5b60ef92da2e6ebe394bdcf2e966328
Svetoslav Ganov [Thu, 17 Aug 2017 02:34:36 +0000 (02:34 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev
am:
357f42bf69
Change-Id: I42b5eabd1e21aa5b7c5ab71b34d5eadada0023aa
TreeHugger Robot [Thu, 17 Aug 2017 02:29:21 +0000 (02:29 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev
Svetoslav Ganov [Wed, 16 Aug 2017 21:50:00 +0000 (14:50 -0700)]
Properly compute default and system set flag on an upgrade
We added the notions of a default value and whether this default is set
by the system for a setting which is needed for experiments since in
case a bad value is pushed we should be able to incrementally rollback
to a stable state. If a system component sets a setting value this
automatically becomes the default. System components are the platform
package, the special UIDs (telephony, etc), apps singed with the
platform cert, system installed persistent apps, and SUW.
In N we did not have the notion of a default and during an upgrade need
to adjust the default and whether this default is set by the system.
This migration runs as the system UID and was incorrectly computing that
the package that changed the settings last was a part of the system and
setting the current value as its default set by the system. This
resulted in taking more storage space as we also count the default which
led the package which changed the setting to go over the quota and that
throws. If the first caller into the settings provider is the system
main
thread (almost certain) we end up throwing an exception on the system
main thread - crashing the system server.
Test: flash N, install an app abusing sys settings, update to O
Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e
bug:
64718888
Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
Sudheer Shanka [Sat, 12 Aug 2017 01:22:16 +0000 (18:22 -0700)]
Fix and enable ConnOnActivityStartTest.
- Set parole duration to 0 so that it won't affect app standby test.
- Use a bound service to send commands to test app instead of broadcasts.
- Remove code to install/delete test app as it will be done as part of tests
initialization.
Bug:
38432755
Test: forrest --extra_args='--class com.android.server.net.ConnOnActivityStartTest' \
test FrameworksServicesTests
Change-Id: Ic6cd574a60c4449195f2c8cd4e04b9cb47f225c8
Merged-In: Ic6cd574a60c4449195f2c8cd4e04b9cb47f225c8
Hugo Benichi [Tue, 8 Aug 2017 04:06:04 +0000 (13:06 +0900)]
Add convenience methods to IpPrefix and LinkAddress
Also moving relevant test files into tests/net as part of runtest
framworks-net.
Also removes testHashCode in LinkAddress() because this test relies on
the assumption that hashCode() is stable across releases or jdk
versions, which is absolutely not true.
This creates maintenance work for little benefit since hashCode is
already tested as part of the equality test.
For instance this test is now broken because hashing for InetAddress
changed.
Bug:
62988545
Bug:
62918393
Test: runtest frameworks-net, added coverage in tests
Merged-In: I695bc3f0e801bf13bc4fc0706565758f12b775b4
Merged-In: I6d3f3c50eaec44e3a0787e849ab28e89f6f4a72d
Merged-In: Iddfec82a08f845e728adadfa6ec58a60a078d6af
Merged-In: I8d6dd5efd226a8b1c4b05d1e1102362b58e094a1
Merged-In: Ied0cc53ac34c7c5f5539507b1979cbf9c215262e
Merged-In: I3b2b7dcb1a9a194fc08643b27bbb5a0e84e01412
(cherry picked from commit
1dfb6b67555d04973dfb9d1100dfc1c6a5200633)
Change-Id: I9a17094bfdc54b9dec671306618e132a4beb59fc
TreeHugger Robot [Thu, 17 Aug 2017 01:52:01 +0000 (01:52 +0000)]
Merge "Add Persian keyboard layout to default layouts" into oc-mr1-dev
Hugo Benichi [Wed, 16 Aug 2017 04:19:04 +0000 (13:19 +0900)]
Allow NetworkAgent "immutable updates" to NetworkCapabilities
This patch loosens the validation checks when a NetworkAgent updates it
NetworkCapabilities: instead of checking that capabilities labeled as
"immutable" stay identical across updates, it is now accepted to change
immutable capabilities in a way that the new NetworkCapabilities
satisfies the old NetworkCapabilities.
This allows a NetworkAgent to update itself in order to match more
requests, but will still catch NetworkAgents that sends degradation
updates causing potentially requests to not match anymore.
Bug:
64125969
Test: runtest frameworks-net
Merged-In: I2a1b3f9c0be6415e40edc989d0c1b03b5631f7b1
Merged-In: I0ab76de59e87c46a6961229399ff7200bce49838
Merged-In: Ied592bf6112574399a1e808da337004e1c35f244
Merged-In: I01e287b4df82a53a522566d33b3166f7801badca
Merged-In: I7ee60daa9c4266e9b9179032815dd7267e06377f
Merged-In: I31ef741eb83d64c476e5930d5762514b5d4cb16f
(cherry picked from commit
bae105a5ccd11430bab14721d1325e2303a673da)
Change-Id: I9d630d63336f4db69f3eb52faa8483f1b1e35d16
Android Build Merger (Role) [Thu, 17 Aug 2017 01:27:30 +0000 (01:27 +0000)]
Merge "Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev am:
1c414bf30b -s ours" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 01:27:06 +0000 (01:27 +0000)]
Merge "Reducing the image sizes further for low-ram devices" into oc-mr1-dev
Justin Klaassen [Thu, 17 Aug 2017 01:22:49 +0000 (01:22 +0000)]
Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
am:
1c414bf30b -s ours
Change-Id: Ia3cabe5460e2f9f2a532e9f038f80909e8176d9b
Michael Wright [Wed, 16 Aug 2017 19:38:21 +0000 (20:38 +0100)]
Add new "fast" filter for ambient light.
The slow filter wasn't converging fast enough when we shortened the
debounce timings but we still want it to ensure there's a long term
change happening, so add a new filter that converges much faster. This
new fast filter is just a weighted sliding window just like the slow
filter, but it has a significantly smaller horizon.
Bug:
64514692
Test: manual
Change-Id: I1e990ac1e6a56268fa42a85399a2d41cc8dd2104
TreeHugger Robot [Thu, 17 Aug 2017 01:10:16 +0000 (01:10 +0000)]
Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
Felipe Leme [Wed, 16 Aug 2017 19:29:53 +0000 (12:29 -0700)]
Fixed NPE when cancellation signal is null.
Test: none for this particular issue, but CtsAutoFillServiceTestCases pass
Fixes:
64759228
Change-Id: I34170440ac388ec6ba7ed5632dc38543a84d0327
Julia Reynolds [Thu, 17 Aug 2017 00:54:22 +0000 (00:54 +0000)]
Merge "Optionally append managed service approvals" into oc-dr1-dev
am:
445a6d42ef -s ours
Change-Id: I8f4d84a128cbdca8e4a9c9e330765b324569bd1c
TreeHugger Robot [Thu, 17 Aug 2017 00:31:42 +0000 (00:31 +0000)]
Merge "Optionally append managed service approvals" into oc-dr1-dev
Siarhei Vishniakou [Thu, 17 Aug 2017 00:30:28 +0000 (00:30 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours am:
3455f8f527
am:
8d272b9dd5
Change-Id: I17ee75a8177368c8bbe7d8bc82138c0edd5b9c02
Siarhei Vishniakou [Thu, 17 Aug 2017 00:14:48 +0000 (00:14 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours
am:
3455f8f527
Change-Id: Id27376f6e99bb52527e6f02af9a2a654bdc1f5b0
Dianne Hackborn [Tue, 15 Aug 2017 21:10:39 +0000 (14:10 -0700)]
Small fix to pm dumpsys formatting.
Get rid of a spurious newline.
Test: builds and runs and prints.
Bug:
64770628
Change-Id: I2b7657ada5e8eb0a2ef90b1bc2e1027493c808a3
Philip P. Moltmann [Wed, 16 Aug 2017 23:49:21 +0000 (23:49 +0000)]
Merge "Don't get struct of children of !laidout viewGroup" into oc-mr1-dev
Siarhei Vishniakou [Wed, 16 Aug 2017 23:47:50 +0000 (23:47 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee
am:
1ca8da1969 -s ours
Change-Id: I7db93785a58b059d17725188d42adfd4c7b7780a
Felipe Leme [Wed, 16 Aug 2017 23:25:07 +0000 (23:25 +0000)]
Revert "Dismiss Autofill Save UI when a new Activity is launched."
This reverts commit
05ea98a3f95a2f5179c01a5bfd4901835a0c1bd8.
Bug:
64693551
Change-Id: I8e7a7b2c5f575cee28f977ae7f3c10752a15d49c
Jeff Davidson [Wed, 16 Aug 2017 17:40:00 +0000 (10:40 -0700)]
Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public.
There is a reasonable use case for carrier apps to turn off this key
(b/
64544341) so it should be visible to apps in the SDK.
Change-Id: I1a06196d4d4c7d6d06026ef74f3f1159c973f8e3
Test: TreeHugger
Fixes:
64721199
Siarhei Vishniakou [Wed, 16 Aug 2017 23:30:28 +0000 (23:30 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8
am:
a5ba83e2ee
Change-Id: I442dc3021f89fe808159ce8787e4d2950a4d0806
David Stevens [Wed, 16 Aug 2017 23:15:05 +0000 (23:15 +0000)]
Merge "DO NOT MERGE Let external activities run when the primary display is off" into oc-mr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 23:14:47 +0000 (23:14 +0000)]
Merge "Log SystemServerShutdown earlier" into oc-mr1-dev