Commit Graph

60820 Commits

Author SHA1 Message Date
Daniel U
412e097034 Merge "Allow different paragraph breaks in fromHtml()" into nyc-dev am: 82b00ede71
am: 2ac36d831a

* commit '2ac36d831a6b4f3c76a72ccd3b9fb5894a58a0ad':
  Allow different paragraph breaks in fromHtml()
2016-02-10 19:35:35 +00:00
Daniel U
2ac36d831a Merge "Allow different paragraph breaks in fromHtml()" into nyc-dev
am: 82b00ede71

* commit '82b00ede712f8da9e92c48fc63e344864d2fb0a0':
  Allow different paragraph breaks in fromHtml()
2016-02-10 19:16:27 +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
Adrian Roos
6e428f82f4 Isolate Keyguard from main thread badness am: 691546e5b7
am: c9ad3299e3

* commit 'c9ad3299e3c7049d2e219eb9fc33b479fce17ba3':
  Isolate Keyguard from main thread badness
2016-02-10 18:25:57 +00:00
Adrian Roos
c9ad3299e3 Isolate Keyguard from main thread badness
am: 691546e5b7

* commit '691546e5b7f94a6e2d76630ee1287e0b9c69e7a8':
  Isolate Keyguard from main thread badness
2016-02-10 18:22:26 +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
59395d8492 Merge "Enabling SoftAP Configuration Backup." into mm-wireless-dev am: c4a1188afd am: 70cffc57e5
am: 16f958146c

* commit '16f958146cce89b16348ceb0daee35ac5b31f5a2':
  Enabling SoftAP Configuration Backup.
2016-02-10 18:16:52 +00:00
Felipe Leme
ee3fd7b4c3 Merge "Whitelisted ACTION_OPEN_EXTERNAL_DIRECTORY to use file:// URIs." into nyc-dev am: d4c6582a60
am: aac64bf7fa

* commit 'aac64bf7fac139cfef1cfe46a3818bf60e60b8d0':
  Whitelisted ACTION_OPEN_EXTERNAL_DIRECTORY to use file:// URIs.
2016-02-10 18:15:48 +00:00
Ritesh Reddy
16f958146c Merge "Enabling SoftAP Configuration Backup." into mm-wireless-dev am: c4a1188afd
am: 70cffc57e5

* commit '70cffc57e5e3884054080e0066fa7fc34243daec':
  Enabling SoftAP Configuration Backup.
2016-02-10 18:10:56 +00:00
Felipe Leme
aac64bf7fa Merge "Whitelisted ACTION_OPEN_EXTERNAL_DIRECTORY to use file:// URIs." into nyc-dev
am: d4c6582a60

* commit 'd4c6582a605d6b6ac03a56053c39c9c5b81266ee':
  Whitelisted ACTION_OPEN_EXTERNAL_DIRECTORY to use file:// URIs.
2016-02-10 18:08: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
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
Rubin Xu
0816fcfd79 Merge "Require delegated cert installer and app restriction manager to exist" into nyc-dev am: 1f3895b9d9
am: c21e6894e0

* commit 'c21e6894e026de1fe2a08e27b200b39fd973922a':
  Require delegated cert installer and app restriction manager to exist
2016-02-10 16:43:46 +00:00
Rubin Xu
c21e6894e0 Merge "Require delegated cert installer and app restriction manager to exist" into nyc-dev
am: 1f3895b9d9

* commit '1f3895b9d996b138e96a8faa3356faccada75e18':
  Require delegated cert installer and app restriction manager to exist
2016-02-10 16:39:18 +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
Julia Reynolds
bf7cf7e19f Merge "Allow apps to know what users think of their notifications." into nyc-dev am: 146d931ece
am: 9ad07f5c6e

* commit '9ad07f5c6eccc2ae46de2660af29c50cd2148a54':
  Allow apps to know what users think of their notifications.
2016-02-10 14:17:44 +00:00
Julia Reynolds
9ad07f5c6e Merge "Allow apps to know what users think of their notifications." into nyc-dev
am: 146d931ece

* commit '146d931ece7fc273311c049067742bab40a9999a':
  Allow apps to know what users think of their notifications.
2016-02-10 14:14:44 +00:00
Julia Reynolds
146d931ece Merge "Allow apps to know what users think of their notifications." into nyc-dev 2016-02-10 14:10:24 +00:00
Elliott Hughes
b79064bd0a Merge "The NDK samples moved a while back." am: 9653790de2
am: 1ac526df67

* commit '1ac526df67af568f47dd1bfa767928c0d268b6cb':
  The NDK samples moved a while back.
2016-02-10 09:22:13 +00:00
Svetoslav Ganov
1bd77c440c Merge "Add an API to query the package name of the services shared lib" into nyc-dev am: e0feadcaac
am: 43e8c55e0f

* commit '43e8c55e0f0d394112517619e376a94ab955f001':
  Add an API to query the package name of the services shared lib
2016-02-10 09:20:04 +00:00
Elliott Hughes
1ac526df67 Merge "The NDK samples moved a while back."
am: 9653790de2

* commit '9653790de25dfa77076701c3c2932ea93b7f9968':
  The NDK samples moved a while back.
2016-02-10 04:50:01 +00:00
Svetoslav Ganov
e0feadcaac Merge "Add an API to query the package name of the services shared lib" into nyc-dev 2016-02-10 03:00:09 +00:00
Svet Ganov
d7b1f41109 Add an API to query the package name of the services shared lib
The servcies shared lib contains components apps can invoke such
as services to bind to, activities to start, UI choosers, etc.
This lib is built from AOSP code but an OEM may chage its
package name. For example, Google renames the package names for
GMS apps from android.foo.bar to com.google.android.foo.bar.
While we have more than one shared lib that are a part of the
platform (currently shared and services libs) the serivces lib
is the only one clients need to start components in, thus need
to know its package name. This change adds an API to query the
package name of the services shared lib. The API is hidden as
currently the only clients are a part of the system.

Change-Id: Ied48fa4819024522791764b22b3336d4f4b42cc3
2016-02-09 18:49:27 -08:00
Jorim Jaggi
1fa868d859 Fix Keyboard overlap with navigation bar am: 65bff3e4e9
am: ff003fe914

* commit 'ff003fe914ecf2938b5850906bd2ed71af42ba9a':
  Fix Keyboard overlap with navigation bar
2016-02-10 01:02:47 +00:00
Jorim Jaggi
65bff3e4e9 Fix Keyboard overlap with navigation bar
FLAG_FULLSCREEN is really the wrong flag for determining whether
to subtract the window insets in the decore view and layout
it with a reduced size - FLAG_LAYOUT_IN_SCREEN suits these needs
much better.

Bug: 26014496
Bug: 26984057
Change-Id: I5c7a0fb7468d3981b91b23aa4c8b1e4841202131
2016-02-10 00:42:18 +00:00
Wale Ogunwale
290c142203 Merge "Reduce jank during pinned stack animation" into nyc-dev am: 0489c1459e
am: 7be50af83c

* commit '7be50af83c0c5b6feb6de31695be322908fe9c3d':
  Reduce jank during pinned stack animation
2016-02-10 00:29:31 +00:00
Elliott Hughes
3edfa8f67b The NDK samples moved a while back.
Change-Id: I10f419b0ad58f9c5417a3f06775e298c74f284dc
2016-02-09 16:12:02 -08:00
Wale Ogunwale
0489c1459e Merge "Reduce jank during pinned stack animation" into nyc-dev 2016-02-10 00:11:11 +00:00
Jeff Sharkey
8003c3d02e Merge "More encryption-aware triaging." into nyc-dev am: 950b30426e
am: 0b0f03a128

* commit '0b0f03a12805f4d936e8d26b267dd6dc7e137bb8':
  More encryption-aware triaging.
2016-02-09 23:32:10 +00:00
Shawn Willden
b8aa1b4704 Merge "Add attestation API to Android KeyStore." into nyc-dev am: ea46bb2cbf
am: 14db164e0c

* commit '14db164e0c9258b2f8d0e46fae4665e91d495c3a':
  Add attestation API to Android KeyStore.
2016-02-09 23:30:23 +00:00
Jeff Sharkey
950b30426e Merge "More encryption-aware triaging." into nyc-dev 2016-02-09 23:00:55 +00:00
Shawn Willden
ea46bb2cbf Merge "Add attestation API to Android KeyStore." into nyc-dev 2016-02-09 22:57:24 +00:00
Jeff Sharkey
c7bacab20f More encryption-aware triaging.
Most of these callers are okay having results omitted when a package
is uninstalled or encryption unaware.  For example, jobs and
notifications can only be enqueued by already running apps.

When clearing zen rules, keep around rules inserted by apps on
ejected external storage devices.

Make ServiceWatcher stricter by requiring that the matching package
be in the system image.

Bug: 26471205, 27105254
Change-Id: Ie41ea8042ac1a54e9cbe0c35cec89e70521e9bed
2016-02-09 15:56:13 -07:00
Yohei Yukawa
7baeceb966 Merge "Make InputMethodInfo#isEncryptionAware() strict." into nyc-dev am: ae8e090004
am: 7f2bfe20e1

* commit '7f2bfe20e17751b8e9e1169c943d53c65949760a':
  Make InputMethodInfo#isEncryptionAware() strict.
2016-02-09 22:50:41 +00:00
Yohei Yukawa
b128427289 Merge changes Icf921fe3,Ie1a8ee22 into nyc-dev am: 2ba26dd87c
am: 3b656f7a82

* commit '3b656f7a821f4ff4b3d882954a4fdba91b491acc':
  Add a utility method to InputMethodInfo for FBE.
  Fix style issues in InputMethodInfo.java.
2016-02-09 22:44:07 +00:00
Andres Morales
7e8da9ca19 Merge "updates to FrameStatsObserver API" into nyc-dev am: 7364905303
am: 3d5a7e408a

* commit '3d5a7e408a1421bee144c87c832a7ac1b0fdc9ab':
  updates to FrameStatsObserver API
2016-02-09 22:36:15 +00:00
Selim Gurun
692c3a9203 Fix build break am: 75827b2fb6
am: ce10f2098b

* commit 'ce10f2098b33e61234f2fa61deb97b0dd013f6a6':
  Fix build break
2016-02-09 22:35:12 +00:00
Selim Gurun
2254773e76 Merge "Introduce a use32bitAbi flag" into nyc-dev am: 8b67c1697e
am: 6e6470cea0

* commit '6e6470cea0f87f7843d79be8300399c49e270996':
  Introduce a use32bitAbi flag
2016-02-09 22:33:03 +00:00
Yohei Yukawa
37db07216e Make InputMethodInfo#isEncryptionAware() strict.
This is a follow up CL to the previous CL [1], which unintentionally
relied on whether the entire application rather than the
InputMethodService is marked to be encryption-aware.  This wasn't
obvious because right now LatinIME is entirely marked to be
encryption-aware, which probably needs to be reconsidered in subsequent
CLs.

This CL drops "encryptionAware" line from InputMethodInfo#dump() as it
is redundant.  The same information is already dumped in the
'ServiceInfo' section.

 [1] Icf921fe3661eccf4a589b08b616d05decc561356
     69811a98f1

Bug: 26279466
Change-Id: I6cea5fe5731f4a6a64ea722b854b99c5154a15ae
2016-02-09 13:39:50 -08:00
Wale Ogunwale
480dca0d1b Reduce jank during pinned stack animation
- Don’t launch Pip overlay activities during pinned stack animation.
This causes extra CPU load and takes a way resources from the running
animation.
- Finish Pip overlay activities before starting pinned stack resize
animation. Reduces the amount of work the system needs to do to keep
the overlays in-sync with the other activities in the pinned stack.
- Use AM.resizeStack with null bounds to take Pip to fullscreen so that
we can animate the bounds changed.
- Also, fixed Activity.enterPictureInPicture API to animate the transition
if Pip is entered from the app instead of Pip manager.

Bug: 25672053
Change-Id: I82399c10f1b8c675ea3861ba973dc8ecfbfbe50f
2016-02-09 12:48:11 -08:00
Julia Reynolds
81afbcdbf9 Allow apps to know what users think of their notifications.
- App wide blocking
- Topic importance

Change-Id: I9026e5c26c5dbcab1c86c385beede891f961933f
2016-02-09 14:54:08 -05:00
Yohei Yukawa
2ba26dd87c Merge changes Icf921fe3,Ie1a8ee22 into nyc-dev
* changes:
  Add a utility method to InputMethodInfo for FBE.
  Fix style issues in InputMethodInfo.java.
2016-02-09 19:49:20 +00:00
Andres Morales
7364905303 Merge "updates to FrameStatsObserver API" into nyc-dev 2016-02-09 19:00:32 +00:00
Selim Gurun
75827b2fb6 Fix build break
Bug: 26874366
Change-Id: Ic7634cb9d823d4f74d2893f4c46a77a5af02a0a1
2016-02-09 10:55:33 -08:00
Andres Morales
910beb8f5d updates to FrameStatsObserver API
- Rename to FrameMetrics to avoid collision with existing
  android.view.FrameStats class
- Make FrameMetricsObserver implementation detail,
  exposing FrameMetricsListener interface as public API
  and wrapping in FrameStatsObserver to maintain state
- Remove dropped frame count call, in favor of passing as
  parameter to callback method.
- Move away from raw timestamp access in favor of Metric IDs
  which represent higher-level, more stable stages in a frame
  lifecycle and match the categories exposed in the onscreen
  bars.
- Support many-to-many Window<->FrameMetricsListener relationship

Change-Id: I00e741d664d4c868b1b6d0131a23f8316bd8c5c2
2016-02-09 10:40:01 -08:00
Selim Gurun
2d291d89f9 Introduce a use32bitAbi flag
Bug: 26874366

On Multiarch apps, it might be necessary to prioritize 32bit Abi ahead
of 64bit ones. The use32bitAbi flag enables this.

This CL also reverts the public api changes in  I2c1fd1d036efe72b28b5fe996416df69a583959f and Ie3ecea6d84e2cb1522e736a21c3a3a24ac62eb27. Previously
the same functionality was provided using a raw abi string that
utilized cpuabioverride flag.

Change-Id: Idce3cbfedd11ef9079ce8a2901e69d30b1cf9ef4
2016-02-09 10:20:21 -08:00
Phil Weaver
cc494765fa Merge "Clean up UiAutomation working alongside a11y." into nyc-dev 2016-02-09 16:59:26 +00:00
Yohei Yukawa
69811a98f1 Add a utility method to InputMethodInfo for FBE.
This is another preparation for Bug 26279466.  Whether an input method
is marked to be encryption-aware or not would become the thing here and
there in the Framework code.  Having a utility method and debug info
in dumpsys should make our lives easier.

Bug: 26279466
Change-Id: Icf921fe3661eccf4a589b08b616d05decc561356
2016-02-09 01:10:27 -08:00