Philip P. Moltmann
da96c949ac
Merge "Handle the uncommon case that a name is null" into nyc-dev
...
am: 80354c4dfe
2016-06-02 00:40:35 +00:00
Philip P. Moltmann
f6070c15f3
Merge "Handle the uncommon case that a name is null" into nyc-dev
...
am: 80354c4dfe
2016-06-02 00:35:22 +00:00
Android Build Merger (Role)
ea0065c5de
Merge "Merge "Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a am: fc536cb862" into nyc-mr1-dev-plus-aosp am: ad63ea9962"
2016-06-02 00:32:14 +00:00
Android Build Merger (Role)
29f3b1f71e
Merge "Merge "Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4 am: 20340d0fc8" into nyc-mr1-dev-plus-aosp am: d73289e7ac"
2016-06-02 00:32:06 +00:00
Android Build Merger (Role)
3eebf4a853
Merge "Merge "Merge "Fix clipRect transform rounding errors" into nyc-dev am: 2957d9d604 am: 0c63355719" into nyc-mr1-dev-plus-aosp am: 4321845b8d"
2016-06-02 00:31:55 +00:00
Android Build Merger (Role)
69a4db87f2
Merge "Merge "Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am: 7fe19060cf am: 815c681f42" into nyc-mr1-dev-plus-aosp am: be28ebecb1"
2016-06-02 00:31:46 +00:00
Android Build Merger (Role)
788ab28152
Merge "Merge "Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a89f am: f2f7bc0454" into nyc-mr1-dev-plus-aosp am: 713a07c3bd"
2016-06-02 00:31:35 +00:00
Doris Liu
63739e7919
Merge "Throw Exception for wrong valueType with API guard"
2016-06-02 00:30:28 +00:00
David Sehr
f8b6855dca
Merge "Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a am: fc536cb862" into nyc-mr1-dev-plus-aosp
...
am: ad63ea9962
2016-06-02 00:30:22 +00:00
Jeff Sharkey
0e1a527c64
Merge "Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4 am: 20340d0fc8" into nyc-mr1-dev-plus-aosp
...
am: d73289e7ac
2016-06-02 00:30:18 +00:00
Chia-I Wu
e7dcad0a06
Merge "Merge "Fix clipRect transform rounding errors" into nyc-dev am: 2957d9d604 am: 0c63355719" into nyc-mr1-dev-plus-aosp
...
am: 4321845b8d
2016-06-02 00:30:13 +00:00
Alex Klyubin
f3f2ad3819
Merge "Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am: 7fe19060cf am: 815c681f42" into nyc-mr1-dev-plus-aosp
...
am: be28ebecb1
2016-06-02 00:30:09 +00:00
Julia Reynolds
830e904578
Merge "Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a89f am: f2f7bc0454" into nyc-mr1-dev-plus-aosp
...
am: 713a07c3bd
2016-06-02 00:30:05 +00:00
Roozbeh Pournader
5536c4fdee
Use bidi heuristics correctly in BoringLayout#isBoring()
...
in order to determine if the text is RTL, the previous code ran
chunks of the text (in code units) through the TextDirectionHeuristic
instead of the whole text, which could result in misdetection as RTL
in various cases, or missing some cases due to RTL characters getting
split across chunks. Now we look at the whole text instead.
This also refactors the code to make it clearer to understand and
removes an unused signature for isBoring.
Bug: 27702584
Change-Id: I8d98614a0af28c0d4e61af5ab4a27a8a3ab8c9dc
2016-06-01 17:29:23 -07:00
Philip P. Moltmann
80354c4dfe
Merge "Handle the uncommon case that a name is null" into nyc-dev
2016-06-02 00:28:52 +00:00
Android Build Merger (Role)
ccc66b5cb7
Merge "Merge "Merge "Show crash/ANR dialogs on userdebug watch builds" into nyc-mr1-dev am: d7b9669b54" into nyc-mr1-dev-plus-aosp am: 11ac61453f"
2016-06-02 00:28:15 +00:00
Android Build Merger (Role)
cea2e5e965
Merge "Merge "Merge "Fix DirectReply bug when reapply fails" into nyc-dev am: 6510bdeada am: 06a49b1e93" into nyc-mr1-dev-plus-aosp am: 97cbc0ad3b"
2016-06-02 00:28:00 +00:00
Android Build Merger (Role)
ada1531896
Merge "Merge "Merge "Introduce ButtonInterface and getHomeId()" into nyc-mr1-dev am: 54c3213304" into nyc-mr1-dev-plus-aosp am: 94d9bdb86d"
2016-06-02 00:27:50 +00:00
Android Build Merger (Role)
3830133fa2
Merge "Merge "Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973ba9 am: 2ae97b4cf2" into nyc-mr1-dev-plus-aosp am: 93e2672d63"
2016-06-02 00:27:39 +00:00
Android Build Merger (Role)
b55bacdfb4
Merge "Merge "Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a89f am: e24e9a0333" into nyc-mr1-dev-plus-aosp am: 2ec07c96ef"
2016-06-02 00:27:30 +00:00
Jae Seo
b0dcc39b53
Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev am: bd2b9e0d53
...
am: 08e5d0596e
2016-06-02 00:26:45 +00:00
Jae Seo
629c992414
Merge "Fix documentation for channel types" into nyc-dev am: cf7b33426e
...
am: 5bb08ad9e0
2016-06-02 00:26:41 +00:00
Erik Wolsheimer
03c2856c7e
Merge "Merge "Show crash/ANR dialogs on userdebug watch builds" into nyc-mr1-dev am: d7b9669b54" into nyc-mr1-dev-plus-aosp
...
am: 11ac61453f
2016-06-02 00:26:25 +00:00
Adrian Roos
8d3c932570
Merge "Merge "Fix DirectReply bug when reapply fails" into nyc-dev am: 6510bdeada am: 06a49b1e93" into nyc-mr1-dev-plus-aosp
...
am: 97cbc0ad3b
2016-06-02 00:26:21 +00:00
Annie Chin
a4b8a2dd89
Merge "Merge "Introduce ButtonInterface and getHomeId()" into nyc-mr1-dev am: 54c3213304" into nyc-mr1-dev-plus-aosp
...
am: 94d9bdb86d
2016-06-02 00:23:45 +00:00
Daichi Hirono
fc4aa530de
Merge "Remove MTP API marked as @removed."
2016-06-02 00:23:40 +00:00
Chong Zhang
b81f88c0ad
Merge "Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973ba9 am: 2ae97b4cf2" into nyc-mr1-dev-plus-aosp
...
am: 93e2672d63
2016-06-02 00:23:38 +00:00
Julia Reynolds
9cec41f03a
Merge "Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a89f am: e24e9a0333" into nyc-mr1-dev-plus-aosp
...
am: 2ec07c96ef
2016-06-02 00:23:32 +00:00
Adrian Roos
6f83f46aaa
Merge "Merge "Fix DirectReply bug when reapply fails" into nyc-dev am: 6510bdeada am: 053ffa6d7c" into nyc-mr1-dev-plus-aosp
...
am: b07aac4e95
2016-06-02 00:20:21 +00:00
Dianne Hackborn
ad6aee3511
Merge "Merge "Fix issue #29058724 : Improve JobScheduler API demo" into nyc-dev am: 61721ee3d7 am: 7aaeb394a9" into nyc-mr1-dev-plus-aosp
...
am: 38827a2eee
2016-06-02 00:20:18 +00:00
Chong Zhang
9c34ecbb81
Merge "Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973ba9 am: 47797a7653" into nyc-mr1-dev-plus-aosp
...
am: 4f01d2390f
2016-06-02 00:20:13 +00:00
Dianne Hackborn
c69822cf0c
Merge "Merge "Fix issue #29058724 : Improve JobScheduler API demo" into nyc-dev am: 61721ee3d7 am: 56b70d51f4" into nyc-mr1-dev-plus-aosp
...
am: 1267b551f1#29058724 : Improve JobScheduler API demo
Change-Id: I91adebd3656d0c2ad370ea92b947473a54ecced0
2016-06-02 00:20:08 +00:00
Dianne Hackborn
322f07b5d9
Merge "Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am: 3e05055af7 am: 6f2181f251" into nyc-mr1-dev-plus-aosp
...
am: fd2cbd6282
2016-06-02 00:20:04 +00:00
Jae Seo
3f1bd14d0b
Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev am: bd2b9e0d53
...
am: 5e0f4e2e29
2016-06-02 00:17:21 +00:00
Jae Seo
4c7db55141
Merge "Fix documentation for channel types" into nyc-dev am: cf7b33426e
...
am: e96afc7bc2
2016-06-02 00:17:17 +00:00
Philip P. Moltmann
a212c0363e
Merge "Use text input to deal with fullscreen IME" into nyc-dev am: ddf5c44567
...
am: 76fb4412b7
2016-06-02 00:17:12 +00:00
Dianne Hackborn
8f8e74dd90
Merge "Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am: 3e05055af7 am: 0acb155338" into nyc-mr1-dev-plus-aosp
...
am: 2726da7c96#29069028 NYC: device boot failure: NPE in AppIdleController
Change-Id: Ic4bff1a6e8f2fc0a41904e5da3c786b569079787
2016-06-02 00:16:16 +00:00
Selim Cinek
f15cbf3a8d
Merge "Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev am: 42621023cf am: 4f2264ed9d" into nyc-mr1-dev-plus-aosp
...
am: db369d5426
2016-06-02 00:16:08 +00:00
Selim Cinek
d24fad96ed
Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev am: 42621023cf am: 7b7b17ab80
...
am: d1c8257832
2016-06-02 00:16:03 +00:00
Felipe Leme
8da7ff6328
Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a am: 9a1dfc9dab
...
am: 602ef2392e
2016-06-02 00:15:57 +00:00
Jorim Jaggi
24316cd628
Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2 am: a036c209db
...
am: 5e8beaf6df
2016-06-02 00:15:50 +00:00
Amith Yamasani
52c21e3453
Setup user restrictions for demo user
...
Prevent certain actions by demo user
Also eliminate immersive mode confirmation when device is
in demo mode.
Bug: 27280140
Change-Id: I6955b7bb5c1ae13e1df36cef822b6fd39cb51e46
2016-06-01 17:12:44 -07:00
Eric Schmidt
28d9d888d5
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a am: 28ed18877b am: 7ed7f324f6
...
am: 546c12cd58
2016-06-02 00:12:01 +00:00
Adrian Roos
4d26c170be
Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650cf am: 2bad55cb1b
...
am: 918739c356
2016-06-02 00:11:55 +00:00
Felipe Leme
3f8ec3331e
Merge "Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a am: d116e0fc14" into nyc-mr1-dev-plus-aosp
...
am: e875210a2c
2016-06-02 00:11:49 +00:00
Jae Seo
08e5d0596e
Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev
...
am: bd2b9e0d53
2016-06-02 00:11:39 +00:00
Jorim Jaggi
7c4986085e
Merge "Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2 am: 859465c105" into nyc-mr1-dev-plus-aosp
...
am: 1c943786eb
2016-06-02 00:11:36 +00:00
Jae Seo
5bb08ad9e0
Merge "Fix documentation for channel types" into nyc-dev
...
am: cf7b33426e
2016-06-02 00:11:32 +00:00
Eric Schmidt
98db6f9b60
Merge "Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a am: 28ed18877b am: 65436b097a" into nyc-mr1-dev-plus-aosp
...
am: 8ee81d525e
2016-06-02 00:11:28 +00:00
Jae Seo
5e0f4e2e29
Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev
...
am: bd2b9e0d53
2016-06-02 00:10:39 +00:00
