Makoto Onuki
fac592f64c
Fix issue with apps restored to lower versions.
...
When restoring to a new device, if a restored app is not compatible
with the old version (e.g. lower version or different signature),
then we won't restore shortcuts, which is working as expected.
However when it happens, the shortcut manager forgot to "un-shadow"
the package information, causing the app to not have shortcuts at all.
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Bug 32999759
Change-Id: I89832360114de0ce1c57d763bcaccab4fdb87b6d
2016-11-21 13:49:31 -08:00
Nancy Zheng
de098d013c
Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev
...
am: f9154e923b
2016-11-21 18:19:53 +00:00
Nancy Zheng
a2193c0b76
Fix createConfirmDeviceCredentialIntent for wear for CTS.
...
am: 43f166dfb4
2016-11-21 18:19:48 +00:00
Nancy Zheng
f9154e923b
Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev
2016-11-21 18:13:06 +00:00
Nancy Zheng
43f166dfb4
Fix createConfirmDeviceCredentialIntent for wear for CTS.
...
Bug: 33000237
Change-Id: I1fdb5a518c41ab005f12d3142763e374b38d7553
2016-11-18 18:15:09 -08:00
Michael Kwan
0995a17481
Fix default dialog background colour for watch devices.
...
am: 56c25af274
2016-11-19 00:12:12 +00:00
Michael Kwan
56c25af274
Fix default dialog background colour for watch devices.
...
Bug: 33008587
Change-Id: I0fe4f9a7244958406d2a3466393476f7775ae995
2016-11-18 15:02:43 -08:00
Marie Janssen
6689f33436
Bluetooth: BLE app tracking fixes
...
Simplify tracking registered BLE Apps and clear the state when we
try to recover bluetooth from starting to ON.
Test: enable and disable bluetooth an LE-only app running
Bug: 32609235
Change-Id: I3233bf8402a3c8fc4886ef21b1e9411bc78d4e2c
2016-11-18 14:36:24 -08:00
TreeHugger Robot
589c217580
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." into nyc-mr2-dev
2016-11-18 19:59:42 +00:00
Erik Wolsheimer
53f88c7826
Merge "Enable swipe to dismiss for watch devices." into cw-f-dev
...
am: d841ee9c81
2016-11-18 19:24:32 +00:00
Michael Kwan
ba28331c3a
Enable swipe to dismiss for watch devices.
...
am: 686de42711
2016-11-18 19:24:27 +00:00
Erik Wolsheimer
d841ee9c81
Merge "Enable swipe to dismiss for watch devices." into cw-f-dev
2016-11-18 19:17:56 +00:00
Felipe Leme
7e45541244
DO NOT MERGE ANYWHERE - Clear preferences when package is removed.
...
(cherry pick of commits 2154caf2f80fa87df84813b8e344f85094a454fd and
da1fc0a9c23697cc255efdccc47862bd1277da3f).
Change-Id: I5a019d771da6ff52ea36ee683a44405f6ea24853
Bug: 30900628
Bug: 28722556
Fixes: 32972310
(cherry picked from commit 20488d97cd
2016-11-18 18:33:39 +00:00
Scott Main
e42d88323a
Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb am: 192a8c4973 am: 97be8864e5
...
am: ec9f41356c
2016-11-18 15:42:08 +00:00
Scott Main
ec9f41356c
Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb am: 192a8c4973
...
am: 97be8864e5
2016-11-18 15:36:33 +00:00
Scott Main
97be8864e5
Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb
...
am: 192a8c4973
2016-11-18 15:30:06 +00:00
Scott Main
192a8c4973
Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359
...
am: c8b11fb7cb
2016-11-18 15:24:18 +00:00
Scott Main
c8b11fb7cb
Add cross-links between FINE and COARSE location permissions. bug: 25371600
...
am: 3fef783359
2016-11-18 15:17:06 +00:00
TreeHugger Robot
d97ccb1c0b
Merge "Added configuration for VT downgrade/tear down when data disabled" into nyc-mr2-dev
2016-11-18 06:05:00 +00:00
Ricky Wai
c40b9a8ee2
Catch KeyStoreException for setting profile lock am: c8fa5ed8f2
...
am: 3b546019dc
2016-11-18 01:43:01 +00:00
Ricky Wai
3b546019dc
Catch KeyStoreException for setting profile lock
...
am: c8fa5ed8f2
2016-11-18 01:38:04 +00:00
Ricky Wai
c8fa5ed8f2
Catch KeyStoreException for setting profile lock
...
When device upgrades from L->N, sid(in gatekeeper) could be 0
even primary profile screenlock is set.
We are now trying to catch the exception so when sid==0 happens,
it will try to tie profile lock again when primary profile is unlocked.
Bug: 32490092
Change-Id: I73011d872ac15e7e09be9bda0165cf7f6a75493a
2016-11-18 00:02:24 +00:00
Michael Kwan
77ad3429a6
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
...
The supports-multiwindow command allows the ability to
check if the device has multiwindow support in the shell.
Bug: 30120559
Change-Id: I466e28d8a794fa457826a6526ef9ef660cd3856c
2016-11-17 23:16:36 +00:00
Jack Yu
80a0e6d56e
Added configuration for VT downgrade/tear down when data disabled
...
Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.
bug: 32880745
Merged-In: Idd33a022b5a31cbc58592587bcb496bd78923ae7
Change-Id: I5c71fc9336b39f114a924861a766ca5cb93d4c69
2016-11-17 09:59:33 -08:00
Fei Wu
eb70bc0d36
Merge "Update colorPrimary in watch" into cw-f-dev
...
am: 447fff8589
2016-11-16 21:15:41 +00:00
FEI WU
78fef4c065
Update colorPrimary in watch
...
am: 9072dcd82c
2016-11-16 21:15:38 +00:00
Fei Wu
447fff8589
Merge "Update colorPrimary in watch" into cw-f-dev
2016-11-16 21:05:28 +00:00
Scott Main
3fef783359
Add cross-links between FINE and COARSE location permissions.
...
bug: 25371600
Change-Id: I7af21b063533085ce20c51d18f118c7752fd77f0
(cherry picked from commit b18745616f
2016-11-16 04:08:16 +00:00
Selim Gurun
83fbb94e18
Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev
2016-11-15 19:57:42 +00:00
Julia Reynolds
fd5f6e9446
Merge "Remove 'until next alarm'." into nyc-mr2-dev
2016-11-15 14:06:39 +00:00
Selim Cinek
96d4aadb4c
Fixed a bug with the emergency affordance in multi user am: b8a7f78d24
...
am: 6cc0b517ba
2016-11-15 01:24:32 +00:00
Selim Cinek
6cc0b517ba
Fixed a bug with the emergency affordance in multi user
...
am: b8a7f78d24
2016-11-15 01:18:35 +00:00
Selim Cinek
b8a7f78d24
Fixed a bug with the emergency affordance in multi user
...
The emergency call was not launched in the current user
and therefore was only launching once the user had switched.
Change-Id: If6f3bcf77d88a0658b6e0f91f7e4da5d6264b04f
Fixes: 32424103
Test: manual: switch to secondary user and launch emergency affordance
2016-11-14 23:00:24 +00:00
Narayan Kamath
7521a1b465
Zygote: Additional whitelists for runtime overlay / other static resources.
...
am: d9a8ee7598
2016-11-14 18:56:09 +00:00
Julia Reynolds
5edde5f18a
Remove 'until next alarm'.
...
Test: manual
Bug: 32773368
Change-Id: I03db93d9371327a8e32929ce7fda66729cfe4a82
2016-11-14 18:18:41 +00:00
Narayan Kamath
d9a8ee7598
Zygote: Additional whitelists for runtime overlay / other static resources.
...
Partially cherry picked from commit 1c15c6357825cd01cc699087f331a8
2016-11-14 17:21:37 +00:00
Narayan Kamath
9087f331a8
Zygote: Additional whitelists for runtime overlay / other static resources.
...
Partially cherry picked from commit 1c15c6357825cd01cc69
2016-11-14 09:07:32 -08:00
Andriy Naborskyy
5c47b5ec06
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours am: fb4beac069 -s ours am: 18305d920e -s ours am: 0a2ac837d1 -s ours
...
am: 415ec85fdb
2016-11-14 14:11:10 +00:00
Andriy Naborskyy
2480121100
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours am: f380f53752 -s ours am: dbbde14239 -s ours am: f566a1d4bf -s ours am: e26d15582b -s ours
...
am: bb1dfdc660
2016-11-14 14:09:55 +00:00
Brian Carlstrom
35063cdb3c
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 am: f9150bf362 am: 58612638d1 am: d9ea80d009
...
am: 46abcdd83f
2016-11-14 14:08:51 +00:00
Narayan Kamath
bf3c83eeac
Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 am: 479385b6b3 am: 5f70cb0898 am: df3e599c7d
...
am: 19ee3109e1
2016-11-14 14:03:02 +00:00
Narayan Kamath
8ecbb2b2ae
Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377 am: f3f784853d am: 8ea47824fa am: 2f2611636b
...
am: 86e1929551
2016-11-14 14:01:54 +00:00
Narayan Kamath
48d16243f9
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090 am: 81fd9e618c am: 2c13554c18 am: fb207962aa am: 44e645e59a
...
am: f2a94f71fb
2016-11-14 14:00:45 +00:00
Andriy Naborskyy
415ec85fdb
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours am: fb4beac069 -s ours am: 18305d920e -s ours
...
am: 0a2ac837d1
2016-11-14 14:00:26 +00:00
Narayan Kamath
deabe2c324
Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa am: d212aa9d13 am: 3b89a68a08 am: 146a0f86a6 am: 327edfeba2
...
am: 51930580bf
2016-11-14 13:59:40 +00:00
Narayan Kamath
9facd98e75
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7 am: 0c8da8aa05 am: 1f9abe310f am: f45a1a0fe6 am: 58d1705c64
...
am: 1886232f48
2016-11-14 13:58:30 +00:00
Andriy Naborskyy
bb1dfdc660
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours am: f380f53752 -s ours am: dbbde14239 -s ours am: f566a1d4bf -s ours
...
am: e26d15582b
2016-11-14 13:56:46 +00:00
Brian Carlstrom
46abcdd83f
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 am: f9150bf362 am: 58612638d1
...
am: d9ea80d009
2016-11-14 13:55:41 +00:00
Narayan Kamath
19ee3109e1
Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 am: 479385b6b3 am: 5f70cb0898
...
am: df3e599c7d
2016-11-14 13:54:35 +00:00
Narayan Kamath
86e1929551
Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377 am: f3f784853d am: 8ea47824fa
...
am: 2f2611636b
2016-11-14 13:53:28 +00:00
