Roozbeh Pournader
61b54967e5
Merge "Use bidi heuristics correctly in BoringLayout#isBoring()"
2016-06-02 18:19:42 +00:00
Chris Wren
3a716c735b
resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev am: d958f83a01
...
am: be2da62d11
* commit 'be2da62d11227c564817906c5df0ceb151ed2436':
make the notification enqueue rate threshold a setting
Change-Id: I499087166d900cfbd4675e54382117c530e0e3ed
2016-06-02 16:48:13 +00:00
Chris Wren
be2da62d11
resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev
...
am: d958f83a01
* commit 'd958f83a017dde230203d91c8daedf36d40c22a6':
make the notification enqueue rate threshold a setting
Change-Id: I5172c1a0f0832f3b93d05f0ab7b7b1ab7233d334
2016-06-02 16:41:30 +00:00
Chris Wren
d958f83a01
resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev
...
Change-Id: I85619e6d8176bf23b6f4090c4573e5d9c248b585
2016-06-02 12:15:35 -04:00
TreeHugger Robot
43c3a7e5a7
Merge "make the notification enqueue rate threshold a setting" into nyc-dev
2016-06-02 15:08:03 +00:00
Chris Wren
763a9bb095
make the notification enqueue rate threshold a setting
...
Bug: 28693065
Change-Id: I08bd2ed342d5347c0075183b239558c50ada4a0a
2016-06-02 15:07:20 +00:00
Calin Juravle
e73843941d
Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037 am: dd2fc463f1" into nyc-mr1-dev-plus-aosp
...
am: 1d28af445b
* commit '1d28af445b716520b972827a61ed4ccf19aeb087':
Don't create or check permissions on profiles during app startup
Change-Id: Icf5cb939565f2aae88f51c9cb55ff13a02351d65
2016-06-02 11:21:02 +00:00
Mudumba Ananth
be69ff0aa8
HFP 1.7 profile update (3/4) am: 0d98ebf997
...
am: 4bf18e1663
* commit '4bf18e1663a44045176ab2b55f66246482a7505a':
HFP 1.7 profile update (3/4)
Change-Id: I9bff61dd2c8c68c76160ec19960ab07696844f84
2016-06-02 10:52:32 +00:00
Android Build Merger (Role)
1d28af445b
Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037 am: dd2fc463f1" into nyc-mr1-dev-plus-aosp
2016-06-02 10:46:32 +00:00
Calin Juravle
afb21eee20
Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037
...
am: dd2fc463f1
* commit 'dd2fc463f1f0a92f613930f372c58af10e58e64c':
Don't create or check permissions on profiles during app startup
Change-Id: I00890adeda97295c0d5630efd7e497d7f0ece8b8
2016-06-02 10:36:40 +00:00
Mudumba Ananth
4bf18e1663
HFP 1.7 profile update (3/4)
...
am: 0d98ebf997
* commit '0d98ebf997b24e96d0328b4195a22832f9ae2664':
HFP 1.7 profile update (3/4)
Change-Id: I1594696d1d341026b7bd7f0a65c5cdac7049492e
2016-06-02 10:33:44 +00:00
Android Build Merger (Role)
2fd085bb4f
Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037" into nyc-mr1-dev
2016-06-02 10:28:56 +00:00
Mudumba Ananth
0d98ebf997
HFP 1.7 profile update (3/4)
...
-> Android Framework changes to add support for
an API to send indicator change in AG.
-> Added a system intent for broadcasting assigned number(ID)
of the supported HF indicators and their values (if received)
Bug: 19983867
Change-Id: If26a7ae5da5686da72ebca9ec3decfe086e2ffb6
2016-06-02 10:21:55 +00:00
Calin Juravle
dd2fc463f1
Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev
...
am: e67a29a037
* commit 'e67a29a037d11d242d6afba6aff5a0feb60e289b':
Don't create or check permissions on profiles during app startup
Change-Id: I1b8f9e4dc894d50041d06e195753116593326af0
2016-06-02 10:18:13 +00:00
Calin Juravle
ae9f5b6559
Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev
...
am: e67a29a037
* commit 'e67a29a037d11d242d6afba6aff5a0feb60e289b':
Don't create or check permissions on profiles during app startup
Change-Id: I43d0c4af8e20fabd3f752ce8ad97f4ad1f28dd1b
2016-06-02 10:18:06 +00:00
Calin Juravle
e67a29a037
Merge "Don't create or check permissions on profiles during app startup" into nyc-dev
2016-06-02 10:10:36 +00:00
Makoto Onuki
9a968df828
Merge "ShortcutManager: API rename" into nyc-mr1-dev am: 60585d12e7
...
am: facbcba617
* commit 'facbcba617766402b03c2b1ecc889dfc0fd9c4a2':
ShortcutManager: API rename
Change-Id: If7da8f53354762bb7e035ab8a9c66e73886545ec
2016-06-02 00:50:25 +00:00
Ta-wei Yen
9e4df538ef
Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev am: 912e2b2c80
...
am: cbf3aa8789
* commit 'cbf3aa8789341c60b1db6cfaaa7033e3623db810':
Add support for source-specific VVM state in VoicemailContract
Change-Id: I196ff66863f852808ffbe2d67e5878f049b15a75
2016-06-02 00:41:02 +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)
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
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
* commit 'ad63ea9962f300a1a660c4b565c29357460d678a':
Installer connection support for dump_profiles
Change-Id: Ia332553255b7ca91e6d53e819a04ce90d0e669a7
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
* commit 'd73289e7ac0efe8032dbfc0a83fbb09baede7bbe':
Release AssetManagers when ejecting storage.
Change-Id: I7e57dd56dba320694109ae66df12c700a450a6b2
2016-06-02 00:30:18 +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
* commit 'be28ebecb19778e3731bca4ab13a3eeb1799be7d':
Use correct cert chain from PKCS#7 SignedData block.
Change-Id: I4407764b81619e091837481b037a6c2a0849f7a8
2016-06-02 00:30:09 +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
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
* commit '1267b551f14252beea0fb73d4e12b34277c26110':
Fix issue #29058724 : Improve JobScheduler API demo
Change-Id: I91adebd3656d0c2ad370ea92b947473a54ecced0
2016-06-02 00:20:08 +00:00
Makoto Onuki
facbcba617
Merge "ShortcutManager: API rename" into nyc-mr1-dev
...
am: 60585d12e7
* commit '60585d12e717d6dd02c89cf177159dbb1c7b4fc9':
ShortcutManager: API rename
Change-Id: Ieca236424835edf8b141706733b3bc98657547ab
2016-06-01 23:32:22 +00:00
Ta-wei Yen
cbf3aa8789
Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev
...
am: 912e2b2c80
* commit '912e2b2c80ba7641f649ae7e130d9febc4caac44':
Add support for source-specific VVM state in VoicemailContract
Change-Id: I0d0555fc9d2d4dfcee9a8cfb29acfe3a109be094
2016-06-01 23:26:31 +00:00
David Sehr
4fa0e17183
Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a
...
am: fc536cb862
* commit 'fc536cb862c67d91eaa7fa94557cdc2f0f415678':
Installer connection support for dump_profiles
Change-Id: I6f8dbd362f6accc2d90409b91e96efed531820d9
2016-06-01 23:15:53 +00:00
Jeff Sharkey
c9c4fe2af9
Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4
...
am: 20340d0fc8
* commit '20340d0fc82bccf883898e9523f3c8aca8c9ac04':
Release AssetManagers when ejecting storage.
Change-Id: I8053660edc7088f26c94fb2a3174a743a8d60636
2016-06-01 23:15:49 +00:00
Alex Klyubin
af53ef2308
Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am: 7fe19060cf
...
am: 815c681f42
* commit '815c681f4243486693830929bf1be472ae1f467b':
Use correct cert chain from PKCS#7 SignedData block.
Change-Id: I01cb9b5f0fb409d5f03120b6cdfca9077b7bceb2
2016-06-01 23:15:40 +00:00
Dianne Hackborn
727da2b880
Merge "Fix issue #29058724 : Improve JobScheduler API demo" into nyc-dev am: 61721ee3d7
...
am: 56b70d51f4
* commit '56b70d51f45ecf101222d90a993f6f6da044ae65':
Fix issue #29058724 : Improve JobScheduler API demo
Change-Id: Ib1eeb21537446f7c7b7b99f30acf8713f07dd57f
2016-06-01 23:12:13 +00:00
David Sehr
fc536cb862
Merge "Installer connection support for dump_profiles" into nyc-dev
...
am: 7c5bcfc21a
* commit '7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
Installer connection support for dump_profiles
Change-Id: I4085587ad80b04bc99efbe51c4480f193186a872
2016-06-01 23:04:25 +00:00
Jeff Sharkey
20340d0fc8
Merge "Release AssetManagers when ejecting storage." into nyc-dev
...
am: 380f3b12a4
* commit '380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
Release AssetManagers when ejecting storage.
Change-Id: I92c0fcbe38dd242cb8a0a3792381de81a7c0384c
2016-06-01 23:04:09 +00:00
Alex Klyubin
815c681f42
Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev
...
am: 7fe19060cf
* commit '7fe19060cfaf09e8756f6488c5f2d6c7bbdd92ea':
Use correct cert chain from PKCS#7 SignedData block.
Change-Id: I5f93eac591446733fe7188e149ad5c4d970a1ba3
2016-06-01 23:03:51 +00:00
David Sehr
2855609944
Merge "Installer connection support for dump_profiles" into nyc-dev
...
am: 7c5bcfc21a
* commit '7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
Installer connection support for dump_profiles
Change-Id: I6cf3d4fe88577ef1d149c3c4b1c3ee7160d9c7e6
2016-06-01 23:03:50 +00:00
Jeff Sharkey
f02954ccd5
Merge "Release AssetManagers when ejecting storage." into nyc-dev
...
am: 380f3b12a4
* commit '380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
Release AssetManagers when ejecting storage.
Change-Id: I54282cfcf53279f87e66cc1263ae9663fe94bc04
2016-06-01 23:03:38 +00:00
Dianne Hackborn
56b70d51f4
Merge "Fix issue #29058724 : Improve JobScheduler API demo" into nyc-dev
...
am: 61721ee3d7
* commit '61721ee3d7b7d55a0535584449b49143b1c2e039':
Fix issue #29058724 : Improve JobScheduler API demo
Change-Id: I3f05621c5e18ca35104ac66f95a96a19c789612d
2016-06-01 22:48:59 +00:00
Makoto Onuki
60585d12e7
Merge "ShortcutManager: API rename" into nyc-mr1-dev
2016-06-01 22:44:11 +00:00
Alex Klyubin
5a347de60f
Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev
...
am: 7fe19060cf
* commit '7fe19060cfaf09e8756f6488c5f2d6c7bbdd92ea':
Use correct cert chain from PKCS#7 SignedData block.
Change-Id: Ieb7d6d212fe26ffa61aa6714ed8315b2c98bfe3d
2016-06-01 22:29:49 +00:00
David Sehr
7c5bcfc21a
Merge "Installer connection support for dump_profiles" into nyc-dev
2016-06-01 22:16:05 +00:00
TreeHugger Robot
380f3b12a4
Merge "Release AssetManagers when ejecting storage." into nyc-dev
2016-06-01 22:14:57 +00:00
Alex Klyubin
7fe19060cf
Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev
2016-06-01 21:55:05 +00:00
Ta-wei Yen
912e2b2c80
Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev
2016-06-01 21:49:47 +00:00
Doris Liu
94db09917a
Throw Exception for wrong valueType with API guard
...
Previously, wrong valueType error is swallowed in jni. As a result,
some animations are quietly skipped without letting developers know.
This CL maintains that behavior for pre-N, and throws Exception
to notify developers of the error for N and above.
Bug: 29009391
Change-Id: I3e8f003cdb97d214da72af3f93a84f64797b1c2c
2016-06-01 14:22:28 -07:00
Adrian Roos
8bfaf5fbff
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am: ff39d3ec2f am: 72bc1299f2
...
am: 86a0e3befe
* commit '86a0e3befe175ebfed8a701ab9be192f909345c3':
MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Change-Id: I53c30dbef2ebcd9f85a753dffd93ddafbd000508
2016-06-01 21:12:10 +00:00
Benjamin Franz
042dd1cee6
Merge "Add an intent extra to force master clear" into nyc-mr1-dev am: 3c826b160c
...
am: 8f79bc6c77
* commit '8f79bc6c7799e2edf3bc13cb82c0972ceeb5edab':
Add an intent extra to force master clear
Change-Id: I4af0022ec5834d2669321d5c9c76956539c8ead7
2016-06-01 21:08:13 +00:00
fionaxu
8882cf98b9
Merge "trim and strip html tags for load safe label name" into nyc-dev am: c16bc88fc9 am: 36befb2dbc
...
am: d97994962d
* commit 'd97994962d0d5e691d4f1df51623685c2af1341a':
trim and strip html tags for load safe label name
Change-Id: I569bea23e9b867fa84c456accb7d24fd03853970
2016-06-01 21:02:33 +00:00
Jeff Sharkey
98bf12f999
Release AssetManagers when ejecting storage.
...
When ejecting a storage device, the system process needs to rapidly
release any open FDs to prevent itself from being killed by vold.
This change examines all ResourceImpls cached inside the system
process and evicts any that reference the storage device being
ejected. (ResourcesManager will gladly recreate any evicted entries
when asked again in the future.)
Also replace broken use of WeakHashMap, since we want the values to
be weak references, not the keys.
Bug: 28867548
Change-Id: Ib9cfc66497149b6d3f8d49213e9779408a331d2a
2016-06-01 14:52:27 -06:00