Commit Graph

60854 Commits

Author SHA1 Message Date
Wale Ogunwale
a7b9f6ef80 Merge "Force pre-N apps to be resizeable." into nyc-dev am: 567704bca2
am: 08e5edac00

* commit '08e5edac0043cd71302f9aea1a64886731e1b289':
  Force pre-N apps to be resizeable.
2016-02-11 19:18:16 +00:00
Jeremy Joslin
55f5c6e6cb Merge "Send explicit broadcasts when the scorer changes." into nyc-dev am: 7df8356724
am: 16060eb6f0

* commit '16060eb6f0371dadda1b5b0e7724383ef0b9a21d':
  Send explicit broadcasts when the scorer changes.
2016-02-11 19:14:17 +00:00
Wale Ogunwale
08e5edac00 Merge "Force pre-N apps to be resizeable." into nyc-dev
am: 567704bca2

* commit '567704bca22c08a6fbfdaa15d054e0e3124b38e8':
  Force pre-N apps to be resizeable.
2016-02-11 19:11:37 +00:00
Jeremy Joslin
16060eb6f0 Merge "Send explicit broadcasts when the scorer changes." into nyc-dev
am: 7df8356724

* commit '7df8356724efde8af5e280a0a57f7fbe39169aaa':
  Send explicit broadcasts when the scorer changes.
2016-02-11 19:09:27 +00:00
Chong Zhang
b40a3ad913 Merge "Use background drawable from the client" 2016-02-11 18:59:06 +00:00
Wale Ogunwale
567704bca2 Merge "Force pre-N apps to be resizeable." into nyc-dev 2016-02-11 18:55:50 +00:00
Jeremy Joslin
7df8356724 Merge "Send explicit broadcasts when the scorer changes." into nyc-dev 2016-02-11 18:55:38 +00:00
Raph Levien
2ca1d4e4e4 Merge "Allow null string to BidiFormatter#unicodeWrap" into nyc-dev
am: 7004c4407f

* commit '7004c4407f0c76bd41d19cd6a2eb867437228ee9':
  Allow null string to BidiFormatter#unicodeWrap
2016-02-11 18:39:21 +00:00
Raph Levien
7004c4407f Merge "Allow null string to BidiFormatter#unicodeWrap" into nyc-dev 2016-02-11 18:35:36 +00:00
Philipp Weiß
38d8cd366e Merge "DPM.createAndManageUser should work even with DISALLOW_ADD_USER set" into nyc-dev
am: 09f8568059

* commit '09f856805902078931aa5de006bc5e2c5403dfa6':
  DPM.createAndManageUser should work even with DISALLOW_ADD_USER set
2016-02-11 17:28:44 +00:00
Philipp Weiß
09f8568059 Merge "DPM.createAndManageUser should work even with DISALLOW_ADD_USER set" into nyc-dev 2016-02-11 17:17:39 +00:00
John Reck
54871d55c2 Merge "Revert "VectorDrawable native rendering - Step 5 of MANY"" into nyc-dev
am: 45242f7125

* commit '45242f7125aef9059e8d258ba91d85fa624d15eb':
  Revert "VectorDrawable native rendering - Step 5 of MANY"
2016-02-11 17:12:52 +00:00
Andreas Gampe
33df0daace Merge "Frameworks/base: Fix LineBreakBufferedWriter" into nyc-dev
am: e610e288cd

* commit 'e610e288cd126af44c009f8b5fcd46a348239e73':
  Frameworks/base: Fix LineBreakBufferedWriter
2016-02-11 17:06:32 +00:00
John Reck
45242f7125 Merge "Revert "VectorDrawable native rendering - Step 5 of MANY"" into nyc-dev 2016-02-11 17:02:48 +00:00
John Reck
e03ef25a3e Revert "VectorDrawable native rendering - Step 5 of MANY"
Bug: 27136799

This reverts commit 18bdf443e3.

Change-Id: I825b061eec2a591f2d18119ba64494624b9ad4f2
2016-02-11 17:02:33 +00:00
Andreas Gampe
e610e288cd Merge "Frameworks/base: Fix LineBreakBufferedWriter" into nyc-dev 2016-02-11 16:26:19 +00:00
Jeremy Joslin
da11f5cdf5 Send explicit broadcasts when the scorer changes.
When the scorer is changed send a targeted broadcast to the previous
scorer (if any) and then a targeted broadcast to the new scorer.

BUG:26815773
Change-Id: If28414f4373a531b10f581ecd096cbc27a7318a4
2016-02-11 07:15:44 -08:00
phweiss
e9c440638e DPM.createAndManageUser should work even with DISALLOW_ADD_USER set
For this, the DPM calls a new function
UserManagerInternal.createUserEvenWhenDisallowed() instead of
UserManager.createUser(). This calls
UserManagerService.createUserInternalUnchecked().

Also, only the system user is allowed to call this method, otherwise
a security exception is thrown.

Bug: 26952210
Bug: 26786199
Change-Id: I69c16354898d68592d13f5f53b840551f7ad4779
2016-02-11 14:43:18 +01:00
Wale Ogunwale
d829d36f09 Force pre-N apps to be resizeable.
We feel this experience is better than the 2-finger gesture.
Added ActivityInfo.RESIZE_MODE_FORCE_RESIZEABLE resizeMode
to indicate we are force resizing an app.

Bug: 27132829
Bug: 26847884
Change-Id: I65db2de0d9f3f171cc3bb136cc1282b3ef3549b0
2016-02-11 05:02:14 -08:00
Daniel U
8779c792ca Tweak toHtml() paragraph conversion behavior
am: 4a70f09e39

* commit '4a70f09e39ac7c5f57b0f6dd44475641c68afafd':
  Tweak toHtml() paragraph conversion behavior
2016-02-11 12:18:38 +00:00
Daniel U
4a70f09e39 Tweak toHtml() paragraph conversion behavior
For mode TO_HTML_PARAGRAPH_LINES_INDIVIDUAL:
1) Empty line outputs <br> instead of <p><br></p>

2) A <ul> element is closed if it is followed by a <br>

3) Explicit zero vertical margin is applied to <ul> instead of <li>'s

4) More deterministic way to encode AlignmentSpans: only spans with
   SPAN_PARAGRAPH flag is used. If multiple spans exist, the last one
   (which is added most recently) is used.

BUG: 26224878
Change-Id: I86a2aeced9965ae465daac1ace64e5e41cf45caf
2016-02-11 12:11:44 +00:00
Daniel U
62b0f47643 Merge "Handle <span>, <ul>, and <li> tags in fromHtml()" into nyc-dev
am: 1914dc60c9

* commit '1914dc60c92111d04f7ad43bd388b195f4373749':
  Handle <span>, <ul>, and <li> tags in fromHtml()
2016-02-11 11:58:10 +00:00
Daniel U
1914dc60c9 Merge "Handle <span>, <ul>, and <li> tags in fromHtml()" into nyc-dev 2016-02-11 11:54:32 +00:00
Michal Karpinski
17ae75883b Log strength of auth method used into security log
am: ed5c8f0216

* commit 'ed5c8f0216bf97e896936e2a2e24fc3fb18303a1':
  Log strength of auth method used into security log
2016-02-11 11:05:43 +00:00
Michal Karpinski
ed5c8f0216 Log strength of auth method used into security log
As approved by Android Security team, added logging of
strength of auth method as well as logging of fingerprint
keyguard actions.

Bug: 26841997
Change-Id: Ic8e3f125f775a7585fe56003f4c6442390edea61
2016-02-11 10:36:56 +00:00
Doris Liu
31f048ce61 VectorDrawable native rendering - Step 5 of MANY
am: 18bdf443e3

* commit '18bdf443e371e9f293439b4ff92cc79abaa422e5':
  VectorDrawable native rendering - Step 5 of MANY
2016-02-11 01:32:50 +00:00
Doris Liu
18bdf443e3 VectorDrawable native rendering - Step 5 of MANY
Implemented reset() (public API for AVD)
and reverse() (internal API that needs to be supported)

Change-Id: Ife1650049f271cad1347943151a5800c40c20aa2
2016-02-11 01:08:47 +00:00
Raph Levien
b68d147b86 Allow null string to BidiFormatter#unicodeWrap
The BidiFormatter#unicodeWrap() methods allow null string, but the
toString() call on the result in the refactored code was crashing.
Also adds @Nullable annotations.

Bug: 27124532
Change-Id: I25922d104587af4a850c3640987af9315c3d3bde
2016-02-10 17:00:22 -08:00
Jeff Davidson
7dde89d09f Merge "Expose APIs to analyze UIDs in UserHandle/Process." into nyc-dev
am: 7f036f8bce

* commit '7f036f8bce5c2f70b2cbc5e252220909bba69b5d':
  Expose APIs to analyze UIDs in UserHandle/Process.
2016-02-11 00:56:42 +00:00
Jeff Davidson
7f036f8bce Merge "Expose APIs to analyze UIDs in UserHandle/Process." into nyc-dev 2016-02-11 00:52:02 +00:00
Mihai Nita
608a73945d Flag all the locales of the default region as suggested
am: c67b64fda4

* commit 'c67b64fda4324d366da18014791406f32f48d025':
  Flag all the locales of the default region as suggested
2016-02-11 00:40:57 +00:00
Mihai Nita
c67b64fda4 Flag all the locales of the default region as suggested
This was done by the SetupWizard to suggest the default locale
before the SIM was detected.
It is also handy for devices without SIM (tablets).

Bug: 26784450
Bug: 26882058
Bug: 26939651
Change-Id: Ia1d3b2ef4756121cf6ca13d5d7280215df060a8f
2016-02-11 00:34:45 +00:00
Shuzhen Wang
48fa7ad713 Merge "Camera2: Clarify ordering between onCaptureStart and onCaptureProgressed" into nyc-dev
am: 1b59699877

* commit '1b5969987799325dd45a1574d5efe82cc8388463':
  Camera2: Clarify ordering between onCaptureStart and onCaptureProgressed
2016-02-10 23:54:36 +00:00
Shuzhen Wang
1b59699877 Merge "Camera2: Clarify ordering between onCaptureStart and onCaptureProgressed" into nyc-dev 2016-02-10 23:48:49 +00:00
Shuzhen Wang
0fc589cb29 Camera2: Clarify ordering between onCaptureStart and onCaptureProgressed
It's not a guarantee that onCaptureProgressed happens after
onCaptureStart for a particular request.

Bug: 26676240
Change-Id: I900c3b36e1738dd3514954498023eaa4a1618989
2016-02-10 15:40:03 -08:00
Jeff Davidson
48aa86bd0b Expose APIs to analyze UIDs in UserHandle/Process.
Clients of the NetworkStatsManager public APIs may get UIDs belonging
to other users, and UIDs which don't actually represent applications.
These APIs allow clients to understand whether a given ID belongs to
the same user as themselves, and whether an ID represents an
application or something else (e.g. a system UID).

Change-Id: Ia56d5891521ce98e5594c41da8f9d756819deb66
2016-02-10 15:20:33 -08:00
Andreas Gampe
f72cc9437b Frameworks/base: Fix LineBreakBufferedWriter
In case of writing single character, check against the buffer length,
not the maximum buffer size.

Bug: 27099774
Change-Id: I83d49ea74cc3d25342ec540b654d3dc68e4e802e
2016-02-10 15:18:24 -08:00
Suprabh Shukla
8cb1196fab Merge "Added an api to uninstall a packge with active DAs" into nyc-dev
am: 338c1d8607

* commit '338c1d860772edc3101ed4860a149e7f3c5fe493':
  Added an api to uninstall a packge with active DAs
2016-02-10 23:10:58 +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
Jeff Sharkey
3b23e1bb8c Merge "Consistent naming for internal storage APIs." into nyc-dev
am: 406e9d44fd

* commit '406e9d44fd7c401c9352a9b40e3e0c0f428847fe':
  Consistent naming for internal storage APIs.
2016-02-10 22:16:54 +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
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
Abhijith Shastry
65fc2d9980 Merge "Add hidden APIs for number blocking which will be used by the system." into nyc-dev
am: ebfc362370

* commit 'ebfc362370d2329cd55df0d4901e2ffd8e9390bd':
  Add hidden APIs for number blocking which will be used by the system.
2016-02-10 21:35:57 +00:00
Ritesh Reddy
180d1a7a24 Merge "Enabled Network Policy Backup/Restore." into mm-wireless-dev am: d9c4bc0c4d
am: f61a847881

* commit 'f61a847881ad251593e15e322dae39cc9bd1cd10':
  Enabled Network Policy Backup/Restore.
2016-02-10 21:28:31 +00: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
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
Adrian Roos
a63cca0b24 Make actions extend over the whole action rail
am: 9b123cf9bb

* commit '9b123cf9bb50f98064ee0a8eed38601ca7c03564':
  Make actions extend over the whole action rail
2016-02-10 19:18:03 +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
Adrian Roos
9b123cf9bb Make actions extend over the whole action rail
Bug: 26767249
Change-Id: I3c67f1de40b218aa21f0a1f68bda1032c0804a14
2016-02-10 18:39:40 +00:00