OSDN Git Service
Marco Nelissen [Tue, 12 Apr 2016 02:41:59 +0000 (02:41 +0000)]
Merge "Add javadoc" into nyc-dev
am:
5b6fd0f
* commit '
5b6fd0fc1a3bf4ff964159080a6a21a534a52212':
Add javadoc
Change-Id: I455d7402062c061debf16aeaa6c112053d67660f
Siyamed Sinir [Tue, 12 Apr 2016 02:37:01 +0000 (02:37 +0000)]
Merge "Fix Patterns.UCS_CHAR character class" into nyc-dev
am:
9f98646
* commit '
9f986466f45d4d114a76b3efe3b2986844d80bcd':
Fix Patterns.UCS_CHAR character class
Change-Id: I3d8cbd995ce977b7afa97beed3512b479c16d427
Marco Nelissen [Tue, 12 Apr 2016 02:33:41 +0000 (02:33 +0000)]
Merge "Add javadoc" into nyc-dev
Siyamed Sinir [Tue, 12 Apr 2016 02:26:27 +0000 (02:26 +0000)]
Merge "Fix Patterns.UCS_CHAR character class" into nyc-dev
Winson [Tue, 12 Apr 2016 02:00:24 +0000 (02:00 +0000)]
Merge "Updating visuals for incompatible apps." into nyc-dev
am:
87c343c
* commit '
87c343cddc19da30df591667eda7bef4300bdb94':
Updating visuals for incompatible apps.
Change-Id: I1128da7385502f5cf4e6ecfc710f525dabc54cbf
Jorim Jaggi [Tue, 12 Apr 2016 02:00:23 +0000 (02:00 +0000)]
Nuke minimum time for camera double tap gesture
am:
4e9817e
* commit '
4e9817ec872033a7801988c32082e9d9f2086789':
Nuke minimum time for camera double tap gesture
Change-Id: I83bcd6b723961b0716b60df97c5120def1205693
Winson Chung [Tue, 12 Apr 2016 01:51:04 +0000 (01:51 +0000)]
Merge "Updating visuals for incompatible apps." into nyc-dev
Winson [Fri, 8 Apr 2016 21:54:02 +0000 (14:54 -0700)]
Updating visuals for incompatible apps.
Bug:
26774190
Change-Id: I688d5dbab0305e794cad832ae92a8e5c9440737a
Siyamed Sinir [Tue, 12 Apr 2016 01:38:28 +0000 (18:38 -0700)]
Fix Patterns.UCS_CHAR character class
Wrap Patterns.UCS_CHAR character class with brackets. Previously CL
Ie6df818dc4d33dfee6ee54432a2231cca51ec423 broke autoLink email and URL
patterns while excluding the empty spaces.
Bug:
28020781
Change-Id: Ieb7d09cb5e544c1e7cbc1a4d665b979c65e7e773
Jaewan Kim [Tue, 12 Apr 2016 01:43:35 +0000 (01:43 +0000)]
Merge "PIP: Implement overlay text fade in/out" into nyc-dev
am:
52cb241
* commit '
52cb241948a79072ce253fa656ce6f847ac4ddcd':
PIP: Implement overlay text fade in/out
Change-Id: Ieb078404cc38870245bb88f1f3befe98ed2bcd7f
Jorim Jaggi [Tue, 12 Apr 2016 01:30:57 +0000 (18:30 -0700)]
Nuke minimum time for camera double tap gesture
When the device was sleeping, we get really really low values so
we can't use that as a filter for anti-falsing, or else the gesture
is extremely unreliable when the device was sleeping.
Bug:
26731262
Change-Id: I9b31a3d58ffc22fca31defb40c69a830cf4aa648
Jaewan Kim [Tue, 12 Apr 2016 01:30:24 +0000 (01:30 +0000)]
Merge "PIP: Implement overlay text fade in/out" into nyc-dev
Tomasz Mikolajewski [Tue, 12 Apr 2016 01:19:27 +0000 (01:19 +0000)]
Merge "Fix selecting with touch in multi-window." into nyc-dev
am:
fbd4b55
* commit '
fbd4b558d5630c83f5bb820328bb606a89b68577':
Fix selecting with touch in multi-window.
Change-Id: I99e3ee0bd9cf5b53533ef841ed61691cda9d940f
Tomasz Mikolajewski [Tue, 12 Apr 2016 01:06:22 +0000 (01:06 +0000)]
Merge "Fix selecting with touch in multi-window." into nyc-dev
Siyamed Sinir [Tue, 12 Apr 2016 00:43:08 +0000 (00:43 +0000)]
Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev
am:
4b92594
* commit '
4b92594857ce52f96252f43c776f3ed31f0ebdfb':
Exclude unicode space characters from autoLink URL patterns
Change-Id: Ie8c41292ab33ed50cd41a62eaa98ca7f1a06db14
Siyamed Sinir [Tue, 12 Apr 2016 00:35:27 +0000 (00:35 +0000)]
Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev
Philip P. Moltmann [Tue, 12 Apr 2016 00:17:47 +0000 (00:17 +0000)]
Merge "If a Disk goes away, remove the notifications that asks the user to format it." into nyc-dev
am:
75a19a6
* commit '
75a19a6fcac7b410e2ff98d11c23071ac2f6b2a1':
If a Disk goes away, remove the notifications that asks the user to format it.
Change-Id: Id8ed9cfc7c6d6f2ef9d6338a165db4c2b619720f
Philip P. Moltmann [Tue, 12 Apr 2016 00:06:18 +0000 (00:06 +0000)]
Merge "If a Disk goes away, remove the notifications that asks the user to format it." into nyc-dev
Jeff Sharkey [Mon, 11 Apr 2016 23:25:25 +0000 (23:25 +0000)]
Merge "Fix notifications that are sent for USER_ALL." into nyc-dev
am:
01a1ad5
* commit '
01a1ad511e126aca0b445457f06e31f903b84ffb':
Fix notifications that are sent for USER_ALL.
Change-Id: I73f0984bf8d298017577fbe20406a0f19996fed6
Makoto Onuki [Mon, 11 Apr 2016 23:25:23 +0000 (23:25 +0000)]
Merge "ShortcutManager: First cut of CTS" into nyc-dev
am:
bc20320
* commit '
bc20320f7f224d1cc5be3c436a1a5ece2067f2ec':
ShortcutManager: First cut of CTS
Change-Id: I23d24480870644cf69575d2f11bfc55056c0fb96
Jeff Sharkey [Mon, 11 Apr 2016 23:19:06 +0000 (23:19 +0000)]
Merge "Fix notifications that are sent for USER_ALL." into nyc-dev
Jeff Sharkey [Mon, 11 Apr 2016 22:30:27 +0000 (16:30 -0600)]
Fix notifications that are sent for USER_ALL.
Also avoid creating a heavy LoadedApk object which will be cached
around in the long-lived system process.
Bug:
28116427
Change-Id: I1a5fc43e6d559a09088636b2fe4b5c76f08d3413
Makoto Onuki [Mon, 11 Apr 2016 23:11:40 +0000 (23:11 +0000)]
Merge "ShortcutManager: First cut of CTS" into nyc-dev
sergeyv [Mon, 11 Apr 2016 23:09:37 +0000 (23:09 +0000)]
Merge "Stop comparing Descriptions with memcmp" into nyc-dev
am:
e414371
* commit '
e41437167b9730d2d3550b1cbb5e2813a101b5f0':
Stop comparing Descriptions with memcmp
Change-Id: Ib8bbf379bed2f48d81957d759804168a20b13455
Adam Powell [Mon, 11 Apr 2016 23:09:36 +0000 (23:09 +0000)]
Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev
am:
e60b8f8
* commit '
e60b8f897065a9600058a7b958f1e0bcd198b0b5':
Prevent duplicate loader onLoadFinished calls on config change
Change-Id: I93fd543a33d9a78f7dbbcadb3261b2e53fd8f2ba
Todd Kennedy [Mon, 11 Apr 2016 22:59:37 +0000 (22:59 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed am:
be58fe0 am:
e265f35 -s ours am:
3bdb89b am:
b757575 am:
d359c8a am:
70b32c1 -s ours
am:
22acc7f
* commit '
22acc7fe202af87173ca9013e6c67a67db8d60da':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ib487fc2e511b5c2e9b1cbcc1efdaf635292c876a
Sergei Vasilinetc [Mon, 11 Apr 2016 22:58:56 +0000 (22:58 +0000)]
Merge "Stop comparing Descriptions with memcmp" into nyc-dev
Adam Powell [Mon, 11 Apr 2016 22:57:45 +0000 (22:57 +0000)]
Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev
Todd Kennedy [Mon, 11 Apr 2016 22:54:43 +0000 (22:54 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed am:
be58fe0 am:
e265f35 -s ours am:
3bdb89b am:
b757575 am:
d359c8a
am:
70b32c1 -s ours
* commit '
70b32c1609fc5dcdb7642c58c1f77ab9dc8c2524':
DO NOT MERGE Fix intent filter priorities
Change-Id: I0a39d5d3898fb52fcc3ac90716e73a94a8c088d9
Todd Kennedy [Mon, 11 Apr 2016 22:49:30 +0000 (22:49 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed am:
be58fe0 am:
e265f35 -s ours am:
3bdb89b am:
b757575
am:
d359c8a
* commit '
d359c8a26d389938d972e1febdd275c6e19f6ab7':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ibcaf0d28db2f332885b4ec9f8ee782e579f1b2b3
Fyodor Kupolov [Mon, 11 Apr 2016 22:44:22 +0000 (22:44 +0000)]
Merge "Make AccountManagerServiceTest work again" into nyc-dev
am:
518bae5
* commit '
518bae5fa411327b14ca1e1496f6c9836da0eccd':
Make AccountManagerServiceTest work again
Change-Id: I162a0022c6f532d2b14dabc71ed891a3e5132d3e
Todd Kennedy [Mon, 11 Apr 2016 22:44:21 +0000 (22:44 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c am:
6e0aff3 am:
a73fa08 -s ours am:
d73c865 am:
e0481f0 am:
e5116c2 am:
f4753cd -s ours
am:
06da4fb
* commit '
06da4fb5819bea0f5cd69b71798112650a0981ef':
DO NOT MERGE Fix intent filter priorities
Change-Id: I48e9d81d5ebcb623683a5c47dc4150ac0ef3b794
Todd Kennedy [Mon, 11 Apr 2016 22:44:03 +0000 (22:44 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed am:
be58fe0 am:
e265f35 -s ours am:
3bdb89b
am:
b757575
* commit '
b7575756c45c28ebc116165e4e51d7ccaea40f47':
DO NOT MERGE Fix intent filter priorities
Change-Id: Iee51ca7b69c8b7f45083b4dc1f657b8773f65595
Fyodor Kupolov [Mon, 11 Apr 2016 22:38:50 +0000 (22:38 +0000)]
Merge "Make AccountManagerServiceTest work again" into nyc-dev
Todd Kennedy [Mon, 11 Apr 2016 22:37:53 +0000 (22:37 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c am:
6e0aff3 am:
a73fa08 -s ours am:
d73c865 am:
e0481f0 am:
e5116c2
am:
f4753cd -s ours
* commit '
f4753cd263beac75501727f87cbde760866bdba5':
DO NOT MERGE Fix intent filter priorities
Change-Id: I03f00278d9ecd8d66a4f4a25cea6a4c4aa67cb67
Todd Kennedy [Mon, 11 Apr 2016 22:37:51 +0000 (22:37 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed am:
be58fe0 am:
e265f35 -s ours
am:
3bdb89b
* commit '
3bdb89bd1c6fa2656061efd095cb794619d0ab06':
DO NOT MERGE Fix intent filter priorities
Change-Id: Id1a5e903e838b9118cc4bbd37879b5e840f8b3b6
Jeff Sharkey [Mon, 11 Apr 2016 22:37:45 +0000 (22:37 +0000)]
Merge "Use callerPackage instead of callerApp." into nyc-dev
am:
03c7b09
* commit '
03c7b09a834a82050351f7a335b2fb457694003d':
Use callerPackage instead of callerApp.
Change-Id: Ib03d2ba46e76262d4d99f6a11341b5bdb8f78da6
Yohei Yukawa [Mon, 11 Apr 2016 22:37:43 +0000 (22:37 +0000)]
Merge "Shift+Meta+Space should reverse-rotate subtypes part 2." into nyc-dev
am:
9dd39f8
* commit '
9dd39f8bcc7f6f12e2e65cf2fcdf27cd169b5268':
Shift+Meta+Space should reverse-rotate subtypes part 2.
Change-Id: I2b4d2c4856b1182d374163b10a3f614112d4472d
Fyodor Kupolov [Fri, 8 Apr 2016 19:14:04 +0000 (12:14 -0700)]
Make AccountManagerServiceTest work again
It was broken for quite a while. Introduced the following changes:
- Use mockito to mock AppOpsManager and UserManager
- Use MockContext directly and override what is necessary.
RenamingDelegatingContext doesn't work with absolute file names for
database paths, which is the case for system server DBs.
Bug:
26279712
Change-Id: I9f2a3892f9bd7a882d78f0bb7beb8669f7dc8c6f
Jeff Sharkey [Mon, 11 Apr 2016 22:33:42 +0000 (22:33 +0000)]
Merge "Use callerPackage instead of callerApp." into nyc-dev
Yohei Yukawa [Mon, 11 Apr 2016 22:33:24 +0000 (22:33 +0000)]
Merge "Shift+Meta+Space should reverse-rotate subtypes part 2." into nyc-dev
Todd Kennedy [Mon, 11 Apr 2016 22:32:47 +0000 (22:32 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed am:
be58fe0
am:
e265f35 -s ours
* commit '
e265f35caa276035535f7546f01a91b4e072de0c':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ide1b16d642573c37bced4d293d91bf043bb0a78d
Todd Kennedy [Mon, 11 Apr 2016 22:32:43 +0000 (22:32 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c am:
6e0aff3 am:
a73fa08 -s ours am:
d73c865 am:
e0481f0
am:
e5116c2
* commit '
e5116c291039dbdfc028a212b02518d0c49b417b':
DO NOT MERGE Fix intent filter priorities
Change-Id: I7a48dd50d17e12343a6c79ba33739f727f29aae2
Philip P. Moltmann [Mon, 11 Apr 2016 22:27:58 +0000 (15:27 -0700)]
If a Disk goes away, remove the notifications that asks the user to format it.
Fixes:
22091912
Change-Id: I78448427c5d2f02d61251e4d697931d0d4e5c517
Todd Kennedy [Mon, 11 Apr 2016 22:27:50 +0000 (22:27 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed
am:
be58fe0
* commit '
be58fe035e8a852c903c3c1c397eaa980670d8f9':
DO NOT MERGE Fix intent filter priorities
Change-Id: I7cd88d627c03199ee8252862c73f88d0b6507dd9
Todd Kennedy [Mon, 11 Apr 2016 22:27:46 +0000 (22:27 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c am:
6e0aff3 am:
a73fa08 -s ours am:
d73c865
am:
e0481f0
* commit '
e0481f0ee6321bd049ead42964dc7b4ecaf98754':
DO NOT MERGE Fix intent filter priorities
Change-Id: I8e1c54619278c261d952d6ed297a6a0f74b2724c
Todd Kennedy [Mon, 11 Apr 2016 22:22:58 +0000 (22:22 +0000)]
DO NOT MERGE Fix intent filter priorities am:
eeb970a am:
cd24c4e am:
bd770bc am:
7b068fa -s ours
am:
1e07bda
* commit '
1e07bda8fb94a6dfd3c18f92cacd504b891701da':
DO NOT MERGE Fix intent filter priorities
Change-Id: I4661b6e35f8d8bdbfd588400dded57b2b8b958f6
Todd Kennedy [Mon, 11 Apr 2016 22:22:35 +0000 (22:22 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours
am:
620a4ed
* commit '
620a4ed031d807c6945d531d1a98374eba369449':
DO NOT MERGE Fix intent filter priorities
Change-Id: I33b683fabecb18a08e10bfd68b9c3ec6abe35f0f
Todd Kennedy [Mon, 11 Apr 2016 22:22:30 +0000 (22:22 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c am:
6e0aff3 am:
a73fa08 -s ours
am:
d73c865
* commit '
d73c865385e2177055962d1015530c48556fd9f8':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ied6935ae9e523f7f824b45ab3057cab1717296d6
Jeff Sharkey [Mon, 11 Apr 2016 22:20:25 +0000 (16:20 -0600)]
Use callerPackage instead of callerApp.
When AlarmManager sends a broadcast, it only knows the packageName
that requested the broadcast, and the callerApp may not even be
running anymore. Since we only need the package name for enforcement,
use that instead of the possibly null callerApp.
Bug:
27397019
Change-Id: I8a52d73b4a83eebf85aa1adbfe06bd8886814d4b
Todd Kennedy [Mon, 11 Apr 2016 22:17:20 +0000 (22:17 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours
am:
c2cc804 -s ours
* commit '
c2cc804407212d3431419cded89de1fd6269eaa2':
DO NOT MERGE Fix intent filter priorities
Change-Id: I60eb783f06f0eb0c09c21ea6ec0fc10340ff63c6
Todd Kennedy [Mon, 11 Apr 2016 22:17:19 +0000 (22:17 +0000)]
DO NOT MERGE Fix intent filter priorities am:
eeb970a am:
cd24c4e am:
bd770bc
am:
7b068fa -s ours
* commit '
7b068fa903e7f10e4f693f67b432e3a88ba9b9b1':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ied039fa8044e28df0a5c63e9935a3bafe4fd2a62
Todd Kennedy [Mon, 11 Apr 2016 22:17:19 +0000 (22:17 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c am:
6e0aff3
am:
a73fa08 -s ours
* commit '
a73fa08457827b17a3db15ccaf52cb65a693d5db':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ie5c2a26cf1c6cc8f363845fb1be187fffc1a88fe
Todd Kennedy [Mon, 11 Apr 2016 22:12:19 +0000 (22:12 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9
am:
ca13384 -s ours
* commit '
ca133845ef815d7cc1f036b1355130a8a867a98c':
DO NOT MERGE Fix intent filter priorities
Change-Id: I88811d2bce66e53998360909612003873e9407af
Todd Kennedy [Mon, 11 Apr 2016 22:12:09 +0000 (22:12 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c
am:
6e0aff3
* commit '
6e0aff30cfe571c117a8f20b15c3b27f3aecc7fa':
DO NOT MERGE Fix intent filter priorities
Change-Id: Icc23a9c2a4dafad3ecbf91e27647318c33b39d6a
Todd Kennedy [Mon, 11 Apr 2016 22:12:05 +0000 (22:12 +0000)]
DO NOT MERGE Fix intent filter priorities am:
eeb970a am:
cd24c4e
am:
bd770bc
* commit '
bd770bc97b7c4745c39d16ca417bd8ddedcaefcf':
DO NOT MERGE Fix intent filter priorities
Change-Id: I7c17baf18e2d25c95fb5b8fa45f5cc7b5936723b
Jeff Sharkey [Mon, 11 Apr 2016 22:12:04 +0000 (22:12 +0000)]
Merge "Abort PRE_BOOT dispatch when user is stopped." into nyc-dev
am:
2b05239
* commit '
2b05239ac83c1b5d9f68475a6e5d162b3eb2c22c':
Abort PRE_BOOT dispatch when user is stopped.
Change-Id: I94e99e7740af29b6f445dd3b146335674ee58a5b
Stephen Hines [Mon, 11 Apr 2016 22:06:49 +0000 (22:06 +0000)]
Merge "Fix typos for the word "Unsupported"." am:
9e57114
am:
1dd551b
* commit '
1dd551b019bbbb3a6a61b1a462b63e57e31a5b98':
Fix typos for the word "Unsupported".
Change-Id: I80a9d5f8504e1e2a14595e26fce7079ee490f06e
Todd Kennedy [Mon, 11 Apr 2016 22:06:38 +0000 (22:06 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3
am:
3dfc6d9
* commit '
3dfc6d986f6142b1e0020c9970f626c7c435711e':
DO NOT MERGE Fix intent filter priorities
Change-Id: Id396cca79db8f830a513746f387fb866c773c778
Todd Kennedy [Mon, 11 Apr 2016 22:06:35 +0000 (22:06 +0000)]
DO NOT MERGE Fix intent filter priorities am:
eeb970a
am:
cd24c4e
* commit '
cd24c4ebc0904342b5c9657c43dfa6c07c6e1eec':
DO NOT MERGE Fix intent filter priorities
Change-Id: Idc3d639cd5494210f06f46b644f465be26eca9b1
Todd Kennedy [Mon, 11 Apr 2016 22:06:35 +0000 (22:06 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours
am:
ebb136c
* commit '
ebb136cbda0ba1caff3c482e00aff416edc5117f':
DO NOT MERGE Fix intent filter priorities
Change-Id: I20536d7bca605aadb8cec8bee5383e1aef9742c9
Jeff Sharkey [Mon, 11 Apr 2016 22:06:12 +0000 (22:06 +0000)]
Merge "Abort PRE_BOOT dispatch when user is stopped." into nyc-dev
Jeff Sharkey [Mon, 11 Apr 2016 22:00:54 +0000 (16:00 -0600)]
Abort PRE_BOOT dispatch when user is stopped.
If a user was started and then stopped in quick succession, we need
to stop dispatching PRE_BOOT broadcasts for that user.
Bug:
28032940
Change-Id: Ie9aedc2cd66a7a2cb2076e5004831cf8fe1afc4a
Stephen Hines [Mon, 11 Apr 2016 22:00:40 +0000 (22:00 +0000)]
Merge "Fix typos for the word "Unsupported"."
am:
9e57114
* commit '
9e571141991b7ac2b9f46856d6268b1e13d03e95':
Fix typos for the word "Unsupported".
Change-Id: Ia29d6f9894a0dfa1449d33ffe07ccfff7de4282d
Todd Kennedy [Mon, 11 Apr 2016 22:00:31 +0000 (22:00 +0000)]
DO NOT MERGE Fix intent filter priorities
am:
d6174e7 -s ours
* commit '
d6174e74020aaec97db5780837a3edcd787018bf':
DO NOT MERGE Fix intent filter priorities
Change-Id: I9d089bfaf20baee25c1999d24020956dcbc2509e
Todd Kennedy [Mon, 11 Apr 2016 22:00:27 +0000 (22:00 +0000)]
DO NOT MERGE Fix intent filter priorities
am:
60351d3
* commit '
60351d3be29977dfe0b422de797a0429edf500b7':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ieca2ee83f22e5d4083f895f52d42a2f697920be7
Todd Kennedy [Mon, 11 Apr 2016 22:00:26 +0000 (22:00 +0000)]
DO NOT MERGE Fix intent filter priorities
am:
eeb970a
* commit '
eeb970ada10d37495ad7a8a4b14ad0506b640eea':
DO NOT MERGE Fix intent filter priorities
Change-Id: I22cfcc61e9ec37242e0e47ef732c9364bdb8a886
Christopher Tate [Mon, 11 Apr 2016 21:55:45 +0000 (21:55 +0000)]
Merge "Scale wallpaper crop to device-suitable size" into nyc-dev
am:
766dc50
* commit '
766dc50eeb444b45e969263ecff38954a51a83e3':
Scale wallpaper crop to device-suitable size
Change-Id: I73e1a6bdd8e4092f6030952a99f4ddef91d10752
Marco Nelissen [Mon, 11 Apr 2016 21:41:33 +0000 (14:41 -0700)]
Add javadoc
Bug:
27952005
Change-Id: Ia1b6b6a723c30979c7c7ad7c0b2c0e7e295f0831
Makoto Onuki [Mon, 11 Apr 2016 21:03:46 +0000 (14:03 -0700)]
ShortcutManager: First cut of CTS
Bug
27548047
Change-Id: Idd7a768ea4fee44c2cf6e3bd473cea9e67f5f7cd
Stephen Hines [Mon, 11 Apr 2016 21:48:34 +0000 (21:48 +0000)]
Merge "Fix typos for the word "Unsupported"."
Winson [Mon, 11 Apr 2016 21:45:25 +0000 (21:45 +0000)]
Adding vibration after successful dock/undock gesture.
am:
d87e9a4
* commit '
d87e9a48571ec0e152b79d3da5f29c4355facb48':
Adding vibration after successful dock/undock gesture.
Change-Id: I07153ea80609d8d2c74db23a2c7bd41a03a590ce
Chris Tate [Mon, 11 Apr 2016 21:45:09 +0000 (21:45 +0000)]
Merge "Scale wallpaper crop to device-suitable size" into nyc-dev
Dianne Hackborn [Mon, 11 Apr 2016 21:40:35 +0000 (21:40 +0000)]
Merge "Fix issue #
28118215: Crash during system boot due to null carrier apps" into nyc-dev
am:
f260d2e
* commit '
f260d2ef84120f580d96f5a62fe2ba196463cead':
Fix issue #
28118215: Crash during system boot due to null carrier apps
Change-Id: I4c7bd5453d526ebc13b93e5e55d03191b4593c69
Winson [Mon, 11 Apr 2016 19:57:31 +0000 (12:57 -0700)]
Adding vibration after successful dock/undock gesture.
Bug:
27588627
Change-Id: I1dd149d4f7e7fccf8ec61b59bab7c14a90b77e45
Robert Greenwalt [Mon, 11 Apr 2016 21:35:48 +0000 (21:35 +0000)]
Merge "Add settings for SUW data control." into nyc-dev
am:
6e1e880
* commit '
6e1e880f001ab3663fba3a7b6d292387efaf7b8f':
Add settings for SUW data control.
Change-Id: I9a919ae9d8a960fa1540f051221643a5af3307c4
Greg Kaiser [Mon, 11 Apr 2016 21:35:46 +0000 (21:35 +0000)]
Merge "NanoApp: Make indentation consistent" into nyc-dev
am:
7c0393a
* commit '
7c0393abdf121aca271f870d492def5b329b6360':
NanoApp: Make indentation consistent
Change-Id: Ib1cdcfc2fe61266d4fcac44739f9273737108f56
Dianne Hackborn [Mon, 11 Apr 2016 21:33:40 +0000 (21:33 +0000)]
Merge "Fix issue #
28118215: Crash during system boot due to null carrier apps" into nyc-dev
Robert Greenwalt [Mon, 11 Apr 2016 21:27:59 +0000 (21:27 +0000)]
Merge "Add settings for SUW data control." into nyc-dev
Adam Powell [Mon, 11 Apr 2016 21:26:58 +0000 (14:26 -0700)]
Prevent duplicate loader onLoadFinished calls on config change
Loaders report entering the started state in two places, once from
their host callbacks and once when moving into their host fragment's
starting state. In the former, we will also deliver load results if
we're finishing a retained cycle.
In practice, the individual fragment start happens first which clears
the report-next-start flag, then the finishRetain step sees that flag
is cleared and dispatches the finished load results again. Change
reportStart to only call onLoadFinished if we are not finishing up a
retain step.
Bug
28074512
Change-Id: I85b848f7d7b239c8fac5aec8f0c91e4eea6bcebf
Chris Craik [Mon, 11 Apr 2016 21:25:17 +0000 (21:25 +0000)]
Merge "Apply clip at reorder barriers to shadows" into nyc-dev
am:
b38cb04
* commit '
b38cb04952202c330b29237aaeeda51165298a57':
Apply clip at reorder barriers to shadows
Change-Id: I33bad16dda8a2618d14e9b345069758f081ed4eb
Chris Thornton [Mon, 11 Apr 2016 21:25:16 +0000 (21:25 +0000)]
Merge "Updates to sound trigger test app." into nyc-dev
am:
d043bbb
* commit '
d043bbb22b17e0594ad190ca732f642b9292a3c0':
Updates to sound trigger test app.
Change-Id: Id6bd74e294a02aebd1bd0e2a451d57ddd788d30b
Greg Kaiser [Mon, 11 Apr 2016 21:21:36 +0000 (21:21 +0000)]
Merge "NanoApp: Make indentation consistent" into nyc-dev
Chris Craik [Mon, 11 Apr 2016 21:17:38 +0000 (21:17 +0000)]
Merge "Apply clip at reorder barriers to shadows" into nyc-dev
Chris Thornton [Mon, 11 Apr 2016 21:14:32 +0000 (21:14 +0000)]
Merge "Updates to sound trigger test app." into nyc-dev
John Reck [Mon, 11 Apr 2016 21:05:20 +0000 (21:05 +0000)]
Merge "Revert "Make stopped state a first-class thing"" into nyc-dev
am:
825fa4d
* commit '
825fa4d5ae7b2907ee1769d09e6333306de2a92e':
Revert "Make stopped state a first-class thing"
Change-Id: I2f2a6281d0e0ba9587b00cdb6f1cb32ac632ee41
Jeff Sharkey [Mon, 11 Apr 2016 20:58:17 +0000 (20:58 +0000)]
Merge "Rate-limit how often we collect wtf() logs." into nyc-dev
am:
cf0cc88
* commit '
cf0cc881ebf2c2f00129dd9e045e23f6bf970d54':
Rate-limit how often we collect wtf() logs.
Change-Id: I4e93eb801fe00f6336c00bd2a2bd7e693526bd98
Steve McKay [Mon, 11 Apr 2016 20:58:11 +0000 (20:58 +0000)]
Merge "Don\'t enable new folder in downloads..." into nyc-dev
am:
eb76763
* commit '
eb76763b80ea9bafbc8792db6f5e59ff98e4ef33':
Don't enable new folder in downloads...
Change-Id: Iae81b70fe2556ecc5c68c01f2f08d77db199fb9a
Seigo Nonaka [Mon, 11 Apr 2016 20:58:04 +0000 (20:58 +0000)]
Merge "Follow the constructor signature change in Minikin." into nyc-dev
am:
f9104e3
* commit '
f9104e33e496aeb5581ba9b89f1564d0cbec71fd':
Follow the constructor signature change in Minikin.
Change-Id: I5d0e3eb8140b28d1ec1313937492713c40816596
John Reck [Mon, 11 Apr 2016 20:54:35 +0000 (20:54 +0000)]
Merge "Revert "Make stopped state a first-class thing"" into nyc-dev
John Reck [Mon, 11 Apr 2016 20:49:28 +0000 (20:49 +0000)]
Revert "Make stopped state a first-class thing"
This reverts commit
945961f78a78eced823d5ba78505c781b079703d.
Change-Id: Iebc1d49fac33380233f8785fc39bec6c30a5e714
Jeff Sharkey [Mon, 11 Apr 2016 20:48:15 +0000 (20:48 +0000)]
Merge "Rate-limit how often we collect wtf() logs." into nyc-dev
Jeff Sharkey [Mon, 11 Apr 2016 20:46:14 +0000 (20:46 +0000)]
Merge "Clean up AudioRouting API internals." into nyc-dev
am:
0e2e780
* commit '
0e2e7806b7092519a1f97364d5c7256251ad03d5':
Clean up AudioRouting API internals.
Change-Id: I2c1758d8843fc603623cf1ac4c698823ec589111
Steve McKay [Mon, 11 Apr 2016 20:41:29 +0000 (20:41 +0000)]
Merge "Don't enable new folder in downloads..." into nyc-dev
Jeff Sharkey [Mon, 11 Apr 2016 20:40:10 +0000 (14:40 -0600)]
Rate-limit how often we collect wtf() logs.
We've seen that aggressive Log.wtf() calls can DoS the system
process, since we fork and collect recent logcat output for each
call. After this CL, we rate-limit to only perform this heavy
lifting 5 times during any given 10 second window of time.
We still log the wtf() message to the binary event log.
Bug:
28117774,
28052546,
27994717,
27381069
Change-Id: Ic91b23fe7ee26818083a8d40fd4850fcb9d93643
Raph Levien [Mon, 11 Apr 2016 20:39:49 +0000 (20:39 +0000)]
Merge "Follow the constructor signature change in Minikin." into nyc-dev
Yohei Yukawa [Mon, 11 Apr 2016 20:13:57 +0000 (13:13 -0700)]
Shift+Meta+Space should reverse-rotate subtypes part 2.
This CL adds JavaDoc to clarify what previous CL [1] wanted to do.
No behavior change is intended in this CL.
[1]: I3694edd80be6dfe18b90360e24ae4d451b331928
d39ae854820edebe3f1cb8580117c451ffa5c4ec
Bug:
25753404
Bug:
28103839
Change-Id: I246223c0856382d68323f22987b998cd1613e98c
Alexey Polyudov [Mon, 11 Apr 2016 20:35:16 +0000 (20:35 +0000)]
Merge "contexthub: nanohub HAL redefined hub_app_name_t; keep in sync" into nyc-dev
am:
34994b7
* commit '
34994b74bbe1a05fc4730fb1d5054f3255da0c54':
contexthub: nanohub HAL redefined hub_app_name_t; keep in sync
Change-Id: Ia8a643093b35b86cf4cdd53cdb2691a7eda622db
Hangyu Kuang [Mon, 11 Apr 2016 20:35:14 +0000 (20:35 +0000)]
Merge "media: update VP9 CodecProfileLevel" into nyc-dev
am:
333c7d3
* commit '
333c7d36008c43a45be9bde672b45218cb6dc707':
media: update VP9 CodecProfileLevel
Change-Id: Icd4caa3922838bd1a5891af28a90413eeed87f52
Jeff Sharkey [Mon, 11 Apr 2016 20:33:49 +0000 (20:33 +0000)]
Merge "Clean up AudioRouting API internals." into nyc-dev
OSDN Git Service
