Tomasz Mikolajewski
5264dd8940
Merge "Fix arguments order in DocumentsContract.moveDocument()." into nyc-dev am: 1f0c3f04a7
...
am: 27e5757786
2016-02-12 01:07:29 +00:00
Tomasz Mikolajewski
27e5757786
Merge "Fix arguments order in DocumentsContract.moveDocument()." into nyc-dev
...
am: 1f0c3f04a7
2016-02-12 00:35:09 +00:00
Tomasz Mikolajewski
1f0c3f04a7
Merge "Fix arguments order in DocumentsContract.moveDocument()." into nyc-dev
2016-02-12 00:26:45 +00:00
Phil Weaver
e49126b0ff
Merge "Fix ViewPager crash for a11y z order." into nyc-dev am: fd32b894ff
...
am: eaebd8be72
2016-02-11 21:30:38 +00:00
Phil Weaver
eaebd8be72
Merge "Fix ViewPager crash for a11y z order." into nyc-dev
...
am: fd32b894ff
2016-02-11 21:23:56 +00:00
Phil Weaver
fd32b894ff
Merge "Fix ViewPager crash for a11y z order." into nyc-dev
2016-02-11 20:58:31 +00:00
Dianne Hackborn
b39ee5ed8e
Merge "Implement transient extras for jobs."
2016-02-11 20:54:53 +00:00
Selim Cinek
afaaf427da
Merge "Added support for media notifications without expanded state" into nyc-dev
...
am: 635f71925a
2016-02-11 19:53:45 +00:00
Selim Cinek
635f71925a
Merge "Added support for media notifications without expanded state" into nyc-dev
2016-02-11 19:37:50 +00:00
Dianne Hackborn
ba60473a65
Implement transient extras for jobs.
...
You can now associate an arbitrary Bundle of extras with a job,
as long as the job is not persisted.
Also implement deep-copy of Bundle.
Change-Id: I7890d627492b664d9b1f039e8cb82f8868de7be3
2016-02-11 11:28:48 -08:00
Wale Ogunwale
08e5edac00
Merge "Force pre-N apps to be resizeable." into nyc-dev
...
am: 567704bca2
2016-02-11 19:11:37 +00:00
Jeremy Joslin
16060eb6f0
Merge "Send explicit broadcasts when the scorer changes." into nyc-dev
...
am: 7df8356724
2016-02-11 19:09:27 +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
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
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
2016-02-11 17:12:52 +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
2016-02-11 17:02:33 +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
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
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
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
Selim Cinek
cc10bfbaaa
Added support for media notifications without expanded state
...
Bug: 26837953
Change-Id: I9fcf56013c44a2420367ef0a908dc45992c8a766
2016-02-10 20:27:53 -08:00
Doris Liu
31f048ce61
VectorDrawable native rendering - Step 5 of MANY
...
am: 18bdf443e3
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
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
Shuzhen Wang
48fa7ad713
Merge "Camera2: Clarify ordering between onCaptureStart and onCaptureProgressed" into nyc-dev
...
am: 1b59699877
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
Suprabh Shukla
8cb1196fab
Merge "Added an api to uninstall a packge with active DAs" into nyc-dev
...
am: 338c1d8607
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
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
24b2b02c4b
Merge "Add hidden APIs for number blocking which will be used by the system." into nyc-dev am: ebfc362370
...
am: 65fc2d9980
2016-02-10 21:47:45 +00:00
Ritesh Reddy
6b4bea36e2
Merge "Enabled Network Policy Backup/Restore." into mm-wireless-dev am: d9c4bc0c4d am: f61a847881
...
am: 180d1a7a24
2016-02-10 21:42:22 +00:00
Abhijith Shastry
65fc2d9980
Merge "Add hidden APIs for number blocking which will be used by the system." into nyc-dev
...
am: ebfc362370
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
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
