Commit Graph

301819 Commits

Author SHA1 Message Date
Jack Yu
5569246e93 Moved implicit intents into explicit intents
Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.

The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver

bug: 33783447
Test: manual
Change-Id: I64db3b05400513bacf278ff9f93236495860803e
2017-01-06 21:59:48 -08:00
Andrii Kulian
6fd63e4df6 Merge "Fix selecting focused stack with secondary displays" 2017-01-07 00:16:49 +00:00
Ruchi Kandoi
eb2d14b81f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev am: cb4f643b95
am: f30c2860d1

Change-Id: Ie1eeb05332e670875704602c1a79ce17972a2e69
2017-01-06 22:42:28 +00:00
Ruchi Kandoi
305e66ed34 nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings. am: 3a1ff62e5a
am: 8673349cc3

Change-Id: Ib860bb7431e679b5ba22b5c825e7f5ac34405780
2017-01-06 22:41:15 +00:00
Ruchi Kandoi
f30c2860d1 Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev
am: cb4f643b95

Change-Id: I36d7312e2e9c6a121b3297c298d4e32867c7d84a
2017-01-06 22:24:54 +00:00
Ruchi Kandoi
8673349cc3 nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
am: 3a1ff62e5a

Change-Id: I1fbc203c2becededcbc8e9d873ff89244c52b7ba
2017-01-06 22:24:46 +00:00
TreeHugger Robot
cb4f643b95 Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev 2017-01-06 22:18:26 +00:00
Fyodor Kupolov
51d34bf06a Merge "Always use multi-dex for FrameworksServiceTests" 2017-01-06 21:45:11 +00:00
Fyodor Kupolov
c0c1123124 Always use multi-dex for FrameworksServiceTests
Otherwise it exceeds ids limit:
ERROR: Dex writing phase: classes.dex has too many IDs. Try using multi-dex

Test: manual - device builds, tests are running
Change-Id: I042cd1b8cb8d41c8db055ba8c6ceb56eb592c30f
2017-01-06 13:36:40 -08:00
Makoto Onuki
2e83edb4b0 Merge "Revert "ShortcutManager: Floating shortcuts shouldn't have target activities."" 2017-01-06 21:32:35 +00:00
TreeHugger Robot
03614f3fec Merge "Move category refresh call into a separeate method." 2017-01-06 21:27:52 +00:00
Ruben Brunk
70632e8cdd Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev am: 0d8c4765b2
am: d6d006c087

Change-Id: I74bfe5a3cabb844839e136fc4b9fc6e83610fba1
2017-01-06 21:23:47 +00:00
Ruben Brunk
7b95418bfe Fix unexpected VR mode exit on package update. am: 1ad4a2d32e
am: 4e61a045e1

Change-Id: Ib5b02c1d27da030cf9f8e75328507b791d934cef
2017-01-06 21:22:57 +00:00
Dan Albert
43c3ea4f16 Merge "Unversion NDK stub libraries." am: ddc7ac8ba6 am: e2b4d4a38a am: 22f0b9d1ae
am: cf49a04ce6

Change-Id: Ia47164a731eea1bc93e9a1259b0d13127ec388cb
2017-01-06 21:15:56 +00:00
Ruben Brunk
d6d006c087 Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev
am: 0d8c4765b2

Change-Id: I709b8c9f3d6d32f3f71c2848716563a6b598d503
2017-01-06 21:14:31 +00:00
Ruben Brunk
4e61a045e1 Fix unexpected VR mode exit on package update.
am: 1ad4a2d32e

Change-Id: Ic0c025d3f360197dc41fe2b999b5d20763285cd5
2017-01-06 21:14:27 +00:00
Dan Albert
cf49a04ce6 Merge "Unversion NDK stub libraries." am: ddc7ac8ba6 am: e2b4d4a38a
am: 22f0b9d1ae

Change-Id: Ie6abad6c56a55cd67c22903cd9d60bd907d45e9b
2017-01-06 21:10:51 +00:00
TreeHugger Robot
0d8c4765b2 Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev 2017-01-06 21:07:29 +00:00
Andrew Sapperstein
9e6a9f5f46 Merge "Update CHAR LIMIT for notification body." into nyc-mr2-dev am: e553cebbeb
am: ad11ecfbbc

Change-Id: Id1c49226eb459eacff6cc5a23b18a62cd3302960
2017-01-06 21:04:16 +00:00
Andrew Sapperstein
27d2440ae4 Update CHAR LIMIT for notification body. am: 429cafb85e
am: ddb2539508

Change-Id: I0aa9498f9669db6d55e5bacf5f23ae5b01ca3229
2017-01-06 21:03:26 +00:00
Dan Albert
22f0b9d1ae Merge "Unversion NDK stub libraries." am: ddc7ac8ba6
am: e2b4d4a38a

Change-Id: I57440577773e47f60e6af4e9112523b78741f9fa
2017-01-06 21:03:24 +00:00
TreeHugger Robot
f51b4ff7b1 Merge "Make sure cleanup is always done when task is removed" 2017-01-06 21:00:19 +00:00
Andrew Sapperstein
ad11ecfbbc Merge "Update CHAR LIMIT for notification body." into nyc-mr2-dev
am: e553cebbeb

Change-Id: I390db320ba7139dcc96f361ce4f850b8125482b9
2017-01-06 20:57:12 +00:00
Andrew Sapperstein
ddb2539508 Update CHAR LIMIT for notification body.
am: 429cafb85e

Change-Id: I2cfa08917ce4581d4119ba7a6e492874368cf957
2017-01-06 20:57:05 +00:00
Dan Albert
e2b4d4a38a Merge "Unversion NDK stub libraries."
am: ddc7ac8ba6

Change-Id: I0cf382ae983796b948acfe84e1bb9b639de86a65
2017-01-06 20:54:52 +00:00
TreeHugger Robot
e553cebbeb Merge "Update CHAR LIMIT for notification body." into nyc-mr2-dev 2017-01-06 20:46:28 +00:00
Treehugger Robot
ddc7ac8ba6 Merge "Unversion NDK stub libraries." 2017-01-06 20:44:19 +00:00
Sergei Vasilinetc
ab08c65533 Merge changes I68d56d76,Iad432577
* changes:
  Hidden method to get a graphic buffer from a hardware bitmap
  Move GraphicBuffer to graphics package
2017-01-06 20:36:41 +00:00
Andrew Sapperstein
5453d0c251 Add temperature config for high temp warning. am: 1cac83218c
am: fcf6cc3062

Change-Id: I403b58b478197bff8d6da19331976a71c5b8dafd
2017-01-06 20:12:01 +00:00
TreeHugger Robot
a8d123de10 Merge "Support for WindowContainer controllers and listeners" 2017-01-06 20:07:31 +00:00
TreeHugger Robot
deafcf02c2 Merge changes If135544e,Ic595b01f
* changes:
  bools: fix use_lock_pattern_drawable javadoc.
  widget: Adding support for custom LockPatternView.
2017-01-06 20:06:02 +00:00
Andrew Sapperstein
fcf6cc3062 Add temperature config for high temp warning.
am: 1cac83218c

Change-Id: I1aedaf0714e0f020f6e062bac716841ec472db2a
2017-01-06 20:04:30 +00:00
Ruchi Kandoi
3a1ff62e5a nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
Bug: 32881476
Test: Manual; backup, change settings, restore

Change-Id: Ibc31b23f632c50a2c7120734fc96e7d855df062e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-01-06 12:02:33 -08:00
Fan Zhang
d2d3e2cce8 Move category refresh call into a separeate method.
By default we no longer refresh category with each setTileEnabled.
Instead app will call update after all setTileEnabled are called.

This saves a lot of async task execution when Settings app starts

Bug: 34103984
Test: RunSettingsRoboTest (no regresssion)
Change-Id: I71ddcdb3e1fc0df6cacb53583a4f7e8ae8d675f1
2017-01-06 11:44:38 -08:00
TreeHugger Robot
677e297537 Merge changes from topics 'List parent profile custom ringtones from managed profile', 'Add/delete custom ringtones from storage'
* changes:
  [RingtoneManager] Option for cursor to list parent sounds
  [RingtoneManager] API to delete custom ringtones
  [RingtoneManager] API to add custom ringtones
2017-01-06 19:35:59 +00:00
Ruben Brunk
1ad4a2d32e Fix unexpected VR mode exit on package update.
Bug: 33809651
Change-Id: Ifbaf705e74eda2bde3e4b2d9092360a1c658e660
2017-01-06 11:23:49 -08:00
Ruchi Kandoi
bc1d78606c Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f am: c1db6c05d0
am: bbc00c877f

Change-Id: I1a84b4ce4215136f30ce7936581ee80230c8abbc
2017-01-06 19:19:51 +00:00
Makoto Onuki
9fd9019cf1 Revert "ShortcutManager: Floating shortcuts shouldn't have target activities."
This reverts commit 106ff7a0a1.

Test: All the unit tests (ShortcutManagerTest1*) CtsShortcutHostTestCases and CtsShortcutManagerTestCases

Change-Id: Iadce2b3785cbf728daa60c4e2ff103e516d85896
2017-01-06 11:17:08 -08:00
Ruchi Kandoi
bbc00c877f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f
am: c1db6c05d0

Change-Id: I874bc8b70d34ce2b579ff34eda0fd90c0284661d
2017-01-06 19:10:22 +00:00
Andrii Kulian
45a61fe529 Make sure cleanup is always done when task is removed
When Stack#removeImmediately() was called it also recursively
called Task#removeImmediately(), which remove tasks from stack.
This lead to Task#mStack reference being nullified, but task
dim layer user was still registered in DimLayerController.
Therefore there was a crash when dim layer animation occured.

This CL moves most of the logic from Task#removeIfPossible() to
Task#removeImmediately() to make sure that cleanup is performed
every time when task is removed.

Change-Id: Id8d72dc8c66b9eeefbf5c918cf0a0df4ea027fde
Fixes: 34052466
Test: bit FrameworksServicesTests:com.android.server.wm.TaskStackTests
Test: #testStackRemoveImmediately
2017-01-06 11:06:19 -08:00
Dan Albert
98e462df7d Unversion NDK stub libraries.
The system versions of these libraries aren't versioned yet.

Bug: https://github.com/android-ndk/ndk/issues/278
Test: make ndk
Change-Id: I74e988be8f60f8728a0bfa7360091cbd9f5b1186
2017-01-06 11:04:14 -08:00
Ruchi Kandoi
c1db6c05d0 Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b
am: 388980d88f

Change-Id: I8d5498492cae8ffe9048422720427855eaad5ca8
2017-01-06 19:03:07 +00:00
Ruchi Kandoi
388980d88f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings."
am: cc4203221b

Change-Id: I4add3ce1cf3170aff887865302964b4425094692
2017-01-06 18:58:17 +00:00
Andrew Sapperstein
429cafb85e Update CHAR LIMIT for notification body.
Test: is comment change
Bug: 34097363
Change-Id: I8ae19c3b5108c9c2f00614cd5d32cee06082a052
2017-01-06 18:57:41 +00:00
Andrii Kulian
7fc22812ce Fix selecting focused stack with secondary displays
When the last activity finishes in the stack we're looking for other
stacks and making it focused. However we weren't doing that if the
stack was on a secondary display, so the focused stack records were
not updated in stack supervisor.

Now we're looking for other stacks on the same display first. If there
is nothing focusable left - shifting focus to next focusable display.

Test: android.server.cts.ActivityManagerDisplayTests
Test: #testStackFocusSwitchOnDisplayRemoved
Test: #testStackFocusSwitchOnStackEmptied
Change-Id: Ifbb893e12cbe9c4928b949a86fc8bc027de181e4
2017-01-06 10:51:01 -08:00
Ruchi Kandoi
cc4203221b Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." 2017-01-06 18:49:45 +00:00
Ruchi Kandoi
104e0b4399 nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
Bug: 32881476
Test: Manual; backup, change settings, restore

Change-Id: Ibc31b23f632c50a2c7120734fc96e7d855df062e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-01-06 18:48:51 +00:00
Yorke Lee
92b504cb9e Merge "Fix for onTaskRemovalStarted callback being sent incorrectly" 2017-01-06 18:32:48 +00:00
Andrew Sapperstein
1cac83218c Add temperature config for high temp warning.
Adds an integer resource (config_warningTemperature) that is used
to display the high temp warning. If it is set to less than 0,
the value from HardwarePropertiesManager#getDeviceTemperatures(
HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN,
HardwarePropertiesManager.TEMPERATURE_THROTTLING) is used instead.

Test: manual
Bug: 30995038
Change-Id: I05aa1b5930c6c151ebac439dfd5c00b3305dc46d
(cherry picked from commit 7518471ab6)
2017-01-06 18:28:10 +00:00
Andrew Sapperstein
e7dc98733d Merge "Add temperature config for high temp warning." 2017-01-06 18:27:26 +00:00