232623 Commits

Author SHA1 Message Date
Andres Morales
e5951de6c8 Merge "check for null members in NotifyHandler" into nyc-dev 2016-02-10 23:01:11 +00:00
Suprabh Shukla
338c1d8607 Merge "Added an api to uninstall a packge with active DAs" into nyc-dev 2016-02-10 22:47:59 +00:00
Erik Kline
db338c2e90 Merge "Incorporate historical WifiStateMachine notions of provisioning." into mm-wireless-dev
am: f94dc18746

* commit 'f94dc18746d93e98d2e48cdd25b799aa20a142ab':
  Incorporate historical WifiStateMachine notions of provisioning.
2016-02-10 22:13:31 +00:00
Jeff Sharkey
406e9d44fd Merge "Consistent naming for internal storage APIs." into nyc-dev 2016-02-10 22:11:52 +00:00
Jeff Sharkey
8212ae0aee Consistent naming for internal storage APIs.
Also completely remove a few confusingly named deprecated APIs.

Change-Id: Ia7e4ea3190a97f0a7dfa9bebf2118da0866ec38f
2016-02-10 15:03:33 -07:00
Jae Seo
a2a0c735ff TIF: Add Active Format Description to TvTrackInfo
Bug: 21277083
Change-Id: Ided4ffcd2816e7bb11a81ef10f3b6e1499c6e89b
2016-02-10 14:03:18 -08:00
Makoto Onuki
cc725a4b6c Merge "Use Slog.e() instead of Slog.wtf() for unknown restrictions" into nyc-dev 2016-02-10 21:59:15 +00:00
Suprabh Shukla
a2ae2238e5 Added an api to uninstall a packge with active DAs
The api deactivates all the active admins in the package, then force
stops the package and starts the uninstall intent for the package. This
is intended to provide an easy way for a user to delete a misbehaving
Device Admin

Bug: b/22359208
cherrypick of Ic7ddd89ef6db53e7e76f805808d9e806100374db

Change-Id: I0d677839120c46f22231a7d6f9cf6630cb020227
2016-02-10 13:57:22 -08:00
Jason Monk
ee4ce4233c Merge changes I8a56254b,I618e363c into nyc-dev
* changes:
  Fix QS input handling
  Extract QS animations to QSContainer
2016-02-10 21:56:17 +00:00
Jason Monk
16ac3774e3 Fix QS input handling
Remove the observable scroll view and put the qs container in its
place.  Also update the NotificationStackScrollerLayout to be aware
of the container and not eat up its touches as scroll events.

Change-Id: I8a56254bf8e76a7cdd63bd637a974c1f3aa49482
2016-02-10 16:54:16 -05:00
Wale Ogunwale
de41f15a14 Merge "Don't stop paused activities that are visible." into nyc-dev 2016-02-10 21:48:42 +00:00
Jason Monk
26a3f15a2c Merge "Move editing from long press to edit button" into nyc-dev 2016-02-10 21:47:55 +00:00
Wale Ogunwale
d802664120 Don't stop paused activities that are visible.
Paused activities can be visible, but stopped activities are not
visible.

Change-Id: I305f77542d198ca897b33ad07ac3fc2a14a04397
2016-02-10 13:46:50 -08:00
Jason Monk
2142843ea5 Move editing from long press to edit button
Change-Id: I2bd0e2febbde4babe05545c79d585280a7b2fb14
2016-02-10 16:44:51 -05:00
Makoto Onuki
ad5619d447 Use Slog.e() instead of Slog.wtf() for unknown restrictions
Slog.wtf() normally indicates a bug in the system, but in this case
it's a caller side issue, so e() is more suitable.

Bug 26918715

Change-Id: I94980cb9dafd34e6c5672bf833fec921df14e6a1
2016-02-10 13:41:15 -08:00
Julia Reynolds
dc414fa479 Merge "Don't unbind services unnecessarily." into nyc-dev 2016-02-10 21:34:55 +00:00
Mark Renouf
06844df823 Assign Theme.DeviceDefault.Settings -> Theme.Micro for watches
This theme is explicitly referenced via a ContextThemeWrapper,
used in InputMethodManager when constructing the alert dialog for
showInputMethodPicker(). This theme does not seem to be referenced
elsewhere in the platform.

BUG: 24803707
Change-Id: I5a67ef6e4387620a9624d13e7d76ef6f4f1d2cd2
2016-02-10 21:23:31 +00:00
Abhijith Shastry
ebfc362370 Merge "Add hidden APIs for number blocking which will be used by the system." into nyc-dev 2016-02-10 21:22:52 +00:00
Youngsang Cho
4ecf78116e TIF: Add INPUT_ID field in RecordedProgram
INPUT_ID can be retrieved from CHANNEL_ID. But, even if the channel
is removed, recording should be playable. So INPUT_ID is needed.

Change-Id: I7042a19758ce71e77ca2ae7613015e4d22f0d41f
2016-02-10 21:16:22 +00:00
Erik Kline
f94dc18746 Merge "Incorporate historical WifiStateMachine notions of provisioning." into mm-wireless-dev 2016-02-10 21:15:11 +00:00
Julia Reynolds
9a86cc0c31 Don't unbind services unnecessarily.
When rebinding services, don't unbind from services that are still allowed to
be bound.

Change-Id: I5f250724d2d0931ee0ac7d1182e9c1d8122bfdf0
2016-02-10 15:56:18 -05:00
Jason Monk
e1be342615 Extract QS animations to QSContainer
Move some of the logic for QS animations into QSContainer with a
stable interface for NotificationPanelView to call.

This also moves the QSPanel out of the scroll container and up
to live in with the header (QSContainer is the parent of both
the header and the QSPanel now).

Change-Id: I618e363ccca2be9197a4a75256e0b7841ca2c61c
2016-02-10 15:42:39 -05:00
Andres Morales
e3f0818b1a check for null members in NotifyHandler
An unexpected message posted to the queue should not
crash the application.

Bug: 27097094
Change-Id: Ide6a07014660ff14e0f287660c534cfa1e0acad9
2016-02-10 12:35:16 -08:00
Abhijith Shastry
b87c90ce9f Add hidden APIs for number blocking which will be used by the system.
These APIs will ensure that blocking is suppressed after the user contacts emergency services.

BUG: 26989170

Change-Id: Ib78c9faa31a6d4bfb62b690f97d5ca8084d69927
2016-02-10 12:06:45 -08:00
Ritesh Reddy
f61a847881 Merge "Enabled Network Policy Backup/Restore." into mm-wireless-dev
am: d9c4bc0c4d

* commit 'd9c4bc0c4db7a8b16d8ea0f58ed0615efc167f47':
  Enabled Network Policy Backup/Restore.
2016-02-10 19:46:20 +00:00
Sergey Poromov
f4f1ca0b47 Merge "Update bmgr tool." into nyc-dev 2016-02-10 19:40:54 +00:00
Sergey Poromov
eb07707232 Merge "Fix that backupFinished() callback is not called sometimes." into nyc-dev 2016-02-10 19:40:50 +00:00
Ritesh Reddy
d9c4bc0c4d Merge "Enabled Network Policy Backup/Restore." into mm-wireless-dev 2016-02-10 19:37:17 +00:00
Jae Seo
c980f43d94 TIF: Clean the hardware input list when the input service is reconnected
Needed to avoid adding duplicate TvInputInfo objects when the hardware
TV input service is killed and reconnected.

Bug: 26503803
Change-Id: I9265219678cb8594d43dac561f1e69c21d9c2733
(cherry picked from commit 6657e292a57e600669b3102d27f69497c45f899d)
2016-02-10 19:33:46 +00:00
Phil Weaver
4354b340bb Fix ViewPager crash for a11y z order.
The ViewPager requires measure/layout to initialize a list used
in getChildDrawingOrder, and crashes when this method is called
too early. Protecting against that by assigning a default value
to the drawing order value of AccessibilityNodeInfo if the View
bounds have not yet been set.

Bug: 27076826
Change-Id: Ic42dbb81d15340f6b021626b1c27ad5abce7e7d1
2016-02-10 11:19:52 -08:00
Daniel U
8b36c0bbd1 Handle <span>, <ul>, and <li> tags in fromHtml()
The vertical spacing of <ul> and <li> are determined by the
FROM_HTML_SEPARATOR_* flags. Foreground color, background color,
and text-decoration CSS attributes are parsed and converted into
the corresponding spans.

Change-Id: I93b232de15753ae510392cbacf45e7453d1ae067
2016-02-10 19:18:09 +00:00
Shreyas Basarge
2b4c8f926f SyncManager sync blow up fix
Duplicates for periodic syncs would be
created just after boot and when a
periodic sync was delayed. This CL fixes
the behavior.

Bug: 26954967
Change-Id: I2440961629d443a62f96360563d435af9137857b
(cherry picked from commit 1675400a7cd0b56e5adc5606fb4fea77f8d24ea5)
2016-02-10 19:09:44 +00:00
Andy Hung
4fdeed9501 Merge "Add AudioRecord timestamps" into nyc-dev 2016-02-10 18:56:16 +00:00
Adrian Roos
9b123cf9bb Make actions extend over the whole action rail
Bug: 26767249
Change-Id: I3c67f1de40b218aa21f0a1f68bda1032c0804a14
2016-02-10 18:39:40 +00:00
Daniel U
82b00ede71 Merge "Allow different paragraph breaks in fromHtml()" into nyc-dev 2016-02-10 18:36:12 +00:00
Daniel U
cf1fa60331 Allow different paragraph breaks in fromHtml()
- Separate block-level elements with different numbers of newline
  characters according to the user specified option flag.

- Parse the ALIGN attribute and the CSS TEXT-ALIGN property to handle text
  alignment.

- Rename "header" to the correct term "heading"

Change-Id: I446fa97155e761623a1da6632a0d872a5e47e8af
2016-02-10 18:28:07 +00:00
Jae Seo
425c8bf292 Merge "TIF: Rename connect()/disconnect() and remove unnecessary methods" into nyc-dev 2016-02-10 18:27:06 +00:00
Jorim Jaggi
dcb6814523 Reset docked stack resizing when divider dies
Bug: 27062375
Change-Id: I699f8d99ceab8405bcb973942787ee80caea12b2
2016-02-10 18:25:22 +00:00
Erik Kline
990fc4968d Incorporate historical WifiStateMachine notions of provisioning.
Also: considerably expand logging capabilities.

Bug: 26991160
Change-Id: I36c3c1d2158ffd178e8ce163b8799d62938f39c7
2016-02-11 03:21:48 +09:00
Aga Wronska
405da7c59b Merge "Improve document rename experience - Initially select the name of the file without extension - Trigger renaming action when software keyboard Done button pressed - Trigger creating new directory when software kayboard Done button pressed" into nyc-dev 2016-02-10 18:19:50 +00:00
Adrian Roos
691546e5b7 Isolate Keyguard from main thread badness
Adds a bindService variant to run the ServiceConnection callbacks
on a dedicated Handler.

Changes KeyguardService binding to use the foreground thread
instead of the main thread and changes state to the
KeyguardScrim on the UI thread.

Bug: 26954967
Change-Id: I9d7bd85382816cd0e23772b14ff6518266a9d232
2016-02-10 18:17:29 +00:00
Ritesh Reddy
70cffc57e5 Merge "Enabling SoftAP Configuration Backup." into mm-wireless-dev
am: c4a1188afd

* commit 'c4a1188afd81b4b773e30ec184839bc1a82b355d':
  Enabling SoftAP Configuration Backup.
2016-02-10 18:04:38 +00:00
Felipe Leme
d4c6582a60 Merge "Whitelisted ACTION_OPEN_EXTERNAL_DIRECTORY to use file:// URIs." into nyc-dev 2016-02-10 18:02:21 +00:00
Ritesh Reddy
c4a1188afd Merge "Enabling SoftAP Configuration Backup." into mm-wireless-dev 2016-02-10 17:48:31 +00:00
Felipe Leme
52fe147602 Whitelisted ACTION_OPEN_EXTERNAL_DIRECTORY to use file:// URIs.
BUG: 27109099
BUG: 26742218
Change-Id: I4848b30e6efbda72ff04a6786bac32f34d528f84
2016-02-10 09:48:01 -08:00
Daichi Hirono
8e87364a67 Keep metadata of documents as disconnected status after the device is
disconnected.

To restore Document IDs when the device is reconnected, we need to keep
the metadata in database so that we can use it as hint to remap document
ID with new MTP IDs.

BUG=26212981

Change-Id: Idcc93c41c09d082a709281022c56188dabc80515
(cherry picked from commit 53f5af3f2ba1328d301a0f8a4ae3f574ccc5da65)
2016-02-10 16:59:22 +00:00
Esteban Talavera
66a320d368 Merge "Check for null on app restrictions managing app APIs" into nyc-dev 2016-02-10 16:43:50 +00:00
Rubin Xu
1f3895b9d9 Merge "Require delegated cert installer and app restriction manager to exist" into nyc-dev 2016-02-10 16:29:35 +00:00
Rubin Xu
f03d0a6bfc Require delegated cert installer and app restriction manager to exist
Enforce that apps with delegated powers to exist on device before
empowering them. This is consistent with DevicePolicyManagerService's
internal logic to clear the delegation power once the package is removed.
For delegated cert installer, only enforce this new restriction on
device admins targeting N or later.

Bug: 26233778
Change-Id: Ia8f45dfd5290958cebb36991c4b6baa03e8c28ae
2016-02-10 16:29:01 +00:00
Esteban Talavera
48e64f20f3 Check for null on app restrictions managing app APIs
Change-Id: I3d3cc9b4a4bd6a2526fd0bd7d8662c6b07183208
2016-02-10 16:24:28 +00:00