Commit Graph

38800 Commits

Author SHA1 Message Date
Chris Thornton
2d452d7dab Update primary key in VIS sound model database.
am: 5bd5cf75e1

Change-Id: Ie35e4a4f15ece95d3b5458f4c5ee06098062c96f
2016-10-17 22:32:17 +00:00
Matthew Bouyack
2cfae5a656 Merge "DO NOT MERGE Improved anti-aliasing for circular display mask" into cw-f-dev 2016-10-17 20:28:55 +00:00
Chris Thornton
5bd5cf75e1 Update primary key in VIS sound model database.
The public API for getting at KeyphraseSoundModels is based on the user,
locale, and keyphrase ID. However, the sound model database would allow
multiple models to be registered using the same values, as it has a
primary key on the model UUID. This can potentially lead to a scenario
where multiple models are enrolled for the same user, and the data that
is returned when querying models is arbitrary.

V6 of the sound model database now enforces a primary key over the user
ID, locale and keyphrase ID. When inserting a new model with the same
primary key, the old model will be removed and the new model will be
used instead.

When upgrading from V5 to V6, if there are any models that would violate
the primary key constraint, they are all dropped.

Bug: 32174118
Change-Id: I9597c6a994f01a426625c3be2c53e826f26f5156
2016-10-17 10:12:04 -07:00
Jakub Adamek
4a6e246671 Search for RRO in Java both in SKU subdir and in vendor/overlay
Currently, if the "ro.boot.vendor.overlay.subdir" property is set, we
only search in the subdir. It seems more powerful to search both in
there and in the standard /vendor/overlay directory.

Also, RRO packages have the "priority" attribute in the <overlay>
attribute in AndroidManifest.xml which serves for disambiguation.

Bug: 32202741
Change-Id: I9ef44b8ca4ac0e92ba02e25b3672c6b274fe4639
2016-10-17 15:52:47 +01:00
Donghyun Cho
02d3fff62d CEC: Check standby action availability before request for sleep mode
am: 02920a08e1

Change-Id: Ibb0966d00afbcc69cfc8d58939bc544f50d57c98
2016-10-16 03:17:26 +00:00
Julius D'souza
c9da667b01 Merge "DO NOT MERGE: remove miscellaneous logging" into cw-f-dev 2016-10-14 23:47:12 +00:00
Julius D'souza
897373916f DO NOT MERGE: remove miscellaneous logging
Change-Id: Id5ca513228e87b3d3b4e66ad34537ed454c65ad2
2016-10-14 15:20:15 -07:00
Matthew Bouyack
c84731ae3b DO NOT MERGE Improved anti-aliasing for circular display mask
Calculate the alpha value for each pixel in the display mask based on
the area of overlap between the circle and that pixel.

This works around a bug in Skia that is fixed in master.

Change-Id: Ieb8df0d6f46f07cff1dbc368d74938ec699e08cf
2016-10-14 14:41:25 -07:00
Michal Karpinski
bc755da55c Don't expose default strong auth timeout as constant
am: 6dbf67fc48

Change-Id: Iacbe9a2de7024e29e9c2c98594ebca828b855a43
2016-10-13 22:52:38 +00:00
Greg Plesur
216ee1f0e7 Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev 2016-10-13 21:02:01 +00:00
Greg Plesur
3514404984 DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should
return 'false' for Wear devices after pairing/upgrade.

BUG: 32019375
Change-Id: I2563efe58c98c5dd8440891e478c89e093d8d9ac
2016-10-13 15:08:14 -04:00
Christopher Tate
4cb8e2de6f Retain allowBackup annotation when system+lock wallpaper becomes lock only
am: edd8dc83d5

Change-Id: I2f3a6587bb7f53517232cf051a345e2c617b3778
2016-10-13 19:04:40 +00:00
Vladislav Kuzkokov
98a145b5af Revert "Fix backup for users hit by erroneous backup disabling"
am: 9f61d17e6a

Change-Id: I460fbb670fbc7a724c981c4fceae0048ff4c9ded
2016-10-13 08:41:52 +00:00
Julius D'souza
0dcdae30cf Merge "DO NOT MERGE: Ambient light sensor changes for doze mode." into cw-f-dev 2016-10-13 07:43:19 +00:00
Julius D'souza
c4e1e4909d DO NOT MERGE: Ambient light sensor changes for doze mode.
Bug: 18573988

Change-Id: I07eed120bdbefd23408921405466566da33c397d
2016-10-12 22:48:42 -07:00
Andrii Kulian
75cd6ef5dc DO NOT MERGE -- Adjust focus when moving task back
am: d4b98705b5

Change-Id: I1d07e84360ef0bfeb6b0ce41466e4042ca70ad81
2016-10-13 05:01:11 +00:00
Andrii Kulian
d4b98705b5 DO NOT MERGE -- Adjust focus when moving task back
Resumed and focused activity should be adjusted simultaneously.
This was missing when task was moved back and focus was adjusted only
after previous activity stopped.

Bug: 31983988
Change-Id: Ie6c908b0c8c1adf94680b42ca5a8c9b01308e361
2016-10-13 03:14:07 +00:00
Robert Carr
bcbf6707b0 Correct recently introduced logic error in seamless rotation detection.
am: e441e7f15f

Change-Id: I3e9bdef49a3749e82dbed82bc230bcaac958608a
2016-10-13 02:15:31 +00:00
Selim Cinek
c46b2ef8d2 Fixed an issue where the emergency affordance would show
am: bd740cd56a

Change-Id: I6ce705cc701bf149dec45feabcf4777cc89afa6a
2016-10-13 00:41:24 +00:00
Christopher Tate
edd8dc83d5 Retain allowBackup annotation when system+lock wallpaper becomes lock only
Bug 32069467

Change-Id: I5d0b91c40e1a2896f2b11efeef7bff84503cf2c0
2016-10-13 00:00:53 +00:00
Robert Carr
e441e7f15f Correct recently introduced logic error in seamless rotation detection.
The code detecting whether we should rotate seamlessly (which for
example we do not support for 180 degree rotations) was moved to before
mRotation was updated, so it was always passing the same value for old
and new rotation, and we were failing to perform the 180 degree rotation
check. Correct this.

Test: Rotate the device 180 degrees at once while in Camera. Things look ok.
Bug: 32025371
Change-Id: I0ef08e8cc4e5d87fdff6d839381196c2b52e71d5
2016-10-12 12:50:32 -07:00
Shreyas Basarge
50a22690f8 Add a delay before scheduling local syncs
am: ba1f790369

Change-Id: I4c880c4111f99d80cee7b960a97133cc0b86d61c
2016-10-12 17:19:56 +00:00
Shreyas Basarge
d5541b987a Merge "Add a delay before scheduling local syncs" into nyc-mr1-dev 2016-10-12 17:09:56 +00:00
Selim Cinek
bd740cd56a Fixed an issue where the emergency affordance would show
If a device isn't voice capable, it shouldn't show the emergency
option.

Test: use tablet which isn't voice capable, insert indian sim and
make sure no emergency option is displayed in global actions.
Bug: 31953703
Change-Id: I351e87320f3ffec76d1c1fc5aac78e5c48c0ac54
2016-10-12 09:33:39 -07:00
Michal Karpinski
6dbf67fc48 Don't expose default strong auth timeout as constant
The admin can instead use the value of 0 to reset to default.

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

Bug: 31430135
Change-Id: I0d6b29ca4eca65d7ca72a8975a0c28c9050a946c
(cherry picked from commit 943aabd11c)
2016-10-12 09:34:12 +00:00
TreeHugger Robot
56746f9830 Merge "Change 2nd and later burn-in protection intervals to 2 mins" into cw-f-dev 2016-10-12 05:03:55 +00:00
Erik Wolsheimer
3b3940d381 Change 2nd and later burn-in protection intervals to 2 mins
BUG: 31855095
Change-Id: I969e24d2db882109855b74430b806247c4fbf6cb
2016-10-11 19:25:17 -07:00
Julia Reynolds
532ebb02a7 Stop posting config asynchronously.
am: 3ebe72b26a

Change-Id: If0ebacf0a128d56c70178a03c1c2532d984c796e
2016-10-12 01:18:33 +00:00
TreeHugger Robot
6c816c6707 Merge "Stop posting config asynchronously." into nyc-mr1-dev 2016-10-12 01:10:58 +00:00
Christopher Tate
f413e3f2fe Respect restoreAnyVersion=true in full-data restore path
am: d990e4d3df

Change-Id: Icf3e6bbfd0fa42707c317d114048d7fe66bf0844
2016-10-12 00:21:10 +00:00
Julia Reynolds
3ebe72b26a Stop posting config asynchronously.
All of the instances of calling into other services with locks held
should be resolved, so this isn't needed anymore.

Test: have 2 rules end or start at the same time; ensure the resulting
state is correct.

Fixes: 28459870
Bug: 31980467

Change-Id: I3f12f1d3b8460361dab6fa9468f0ede55ca8dd5e
(cherry picked from commit 89aeab0e71)
2016-10-11 23:04:38 +00:00
Christopher Tate
d990e4d3df Respect restoreAnyVersion=true in full-data restore path
The scheduling mechanism was properly checking for it, but the raw
data-handling engine wasn't.  Now it is.

Bug 32054889

Change-Id: Id57ea12be8e2674c4f678f058278b8c14865b6fa
2016-10-11 15:29:39 -07:00
Nick Kralevich
f0c0188a8a Delete "Show CPU usage"
am: fc4a5c2d85

Change-Id: I4da784d136601fb3458b8697a0a27a232cd89111
2016-10-11 18:09:10 +00:00
Nick Kralevich
ab7a44b41a Merge "Delete "Show CPU usage"" into nyc-mr1-dev 2016-10-11 18:03:29 +00:00
Andrii Kulian
7778de938a Fix bounds rotation logic
am: 781240d9bb

Change-Id: I64a81112b8384a3281cde20bf0f4a6e1628d746c
2016-10-11 17:28:31 +00:00
Andrii Kulian
8e10f945bd Merge "Fix bounds rotation logic" into nyc-mr1-dev 2016-10-11 17:16:31 +00:00
Shunta Sato
55bcb9f422 Fix: "adb install -s" adaptation for session based install
am: 4f26cb5a36

Change-Id: I65d94a002a382c2a2b91d6b8348c003b9e6ab859
2016-10-11 16:52:33 +00:00
Nick Kralevich
fc4a5c2d85 Delete "Show CPU usage"
This functionality hasn't worked since Lollipop.

Bug: 21388590
Change-Id: Ie4388d88f6e06f3e2d2e84e9c4515b3ebc6a0ea5
2016-10-11 09:01:38 -07:00
Shunta Sato
4f26cb5a36 Fix: "adb install -s" adaptation for session based install
Internal implementation of "adb install" has been changed to
session install. As a result '-s' option doesn't work.
Size info is required when using '-s' option in session install.
PackageHelper.fitsOnExternal() returns false and moving app to SD is
failed when size info is not set.

So set size info when '-s' option is used.
And change identity on some method because shell doesn't have some
permission to access to asec.

Bug: 29932779
Author: Ryuki Nakamura <ryuki.x.nakamura@sonymobile.com>
Change-Id: I65edcc0f01ceecaaba17792ad329791a9253d603
2016-10-11 06:33:22 -07:00
Donghyun Cho
02920a08e1 CEC: Check standby action availability before request for sleep mode
When the playback device is asked to go to Standby state with <Standby>
message, it needs to check whether it can accept the request or
not. This check should be done before asking the system for sleep mode.

Additionally, this change will fix the behavior after screen
timeout. After the timeout, playback device may go into sleep mode, but
canGoToStandby() check will prevent the device from tracking the right
current power status value. So need to set the status properly, and keep
HdmiCecLocalDevices enabled for accepting future CEC commands.

Bug: 30182748
Test: Check fugu screen after turning off/on Samsung TV and
Archer. Also tested the case of screen timeout.
Change-Id: Idbcd7abd5d4e22942845760f77f7f7e622b987c0
2016-10-11 17:48:39 +09:00
Christopher Tate
660ad176e9 Ignore wallpaper relaunch timeout during shutdown
am: 762dfd1566

Change-Id: I824dd66b4a9d30c010112038156146750275cb89
2016-10-11 03:06:05 +00:00
Christopher Tate
762dfd1566 Ignore wallpaper relaunch timeout during shutdown
Because of course during system shutdown, the wallpaper service
won't actually get relaunched.  Sometimes shutdown can take long
enough that this timeout kicks, so we need to avoid clearing the
live wallpaper state spuriously.

For simplicity we just check at "would have timed out now" time
rather than try to distinguish between the shutdown case and a
genuine crash that raced with the shutdown broadcast.

Bug 32020355

Change-Id: I9335b2c0214b4c750ef950fed157d186aa670176
2016-10-10 17:50:31 -07:00
Lifu Tang
8786a6b904 Fixed the memory leak when receiving Nav messages
am: fe427f24e5

Change-Id: Iaae06561c8247b2292a10ec24bf3d1a264850ad9
2016-10-10 19:12:38 +00:00
Lifu Tang
9e4733ed33 Merge "Fixed the memory leak when receiving Nav messages" into nyc-mr1-dev 2016-10-10 19:00:10 +00:00
Jorim Jaggi
84e863e02f Fix dismissing window showing
am: f20b1428f8

Change-Id: I58829c0bc567fc3c48e03276075d9256649d84e3
2016-10-10 11:55:13 +00:00
Jorim Jaggi
b29dadb939 Merge "Fix dismissing window showing" into nyc-mr1-dev 2016-10-10 11:47:02 +00:00
Lifu Tang
fe427f24e5 Fixed the memory leak when receiving Nav messages
Bug: 32038182

Change-Id: Ie659dc945d6efc7feaf9285d3e7375c90cba7234
2016-10-09 09:37:12 -07:00
Wyatt Riley
b517705602 Removing over-active NTP & XTRA assistance downloads
am: 0d6e54e246

Change-Id: I6d6a151fb7bb13ddabed10aa33f20aec8cefe8a8
2016-10-07 21:13:54 +00:00
Wyatt Riley
d270004959 Merge "Removing over-active NTP & XTRA assistance downloads" into nyc-mr1-dev 2016-10-07 21:05:57 +00:00
Jorim Jaggi
f20b1428f8 Fix dismissing window showing
Only show dismissing window if we are about to unlock, and not just
in all cases. For that, set a flag to true during the process, and
reset the flag after the Keyguard has unlocked.

Test: Have a FLAG_SHOW_WHEN_LOCKED activity that starts a
FLAG_DISMISS_KEYGUARD_ACTIVITY. Check whether window is hidden
when toggling the power button. Make sure that the device is
in a trusted state during the whole test.

Change-Id: I9346dd869d1cf50a42c64a5f7c69f8e24f1e1f9b
Fixes: 31810884
2016-10-07 15:31:05 +00:00