OSDN Git Service
Yi Kong [Tue, 12 Apr 2016 14:45:10 +0000 (15:45 +0100)]
Track libcore change
2115cc0ca7d60965a361129d8826478ff2d847e4
Bug:
28108421
Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e
(cherry picked from commit
5182e272ad7b14604dc4d90114d97cf238140178)
Shubham Ajmera [Tue, 12 Apr 2016 12:38:31 +0000 (12:38 +0000)]
Merge "Track libcore change
135ea6cd4f7ebe2f225351a1928d8a62bce5cb00" into nyc-dev am:
68b19f2
am:
0983951
* commit '
098395171952abb0a2fd8bdeb5ecb7b8f5d8b2f4':
Track libcore change
135ea6cd4f7ebe2f225351a1928d8a62bce5cb00
Change-Id: I10b7b20ca7cd96b57c68a85377e6ea8ba4c83546
Shubham Ajmera [Tue, 12 Apr 2016 12:32:27 +0000 (12:32 +0000)]
Merge "Track libcore change
135ea6cd4f7ebe2f225351a1928d8a62bce5cb00" into nyc-dev
am:
68b19f2
* commit '
68b19f2778989c3f4ae9eb2407f40c97e11fb57d':
Track libcore change
135ea6cd4f7ebe2f225351a1928d8a62bce5cb00
Change-Id: Ic7d284eb2a8467e24884fe4fb786127d57951244
Kirill Grouchnikov [Tue, 12 Apr 2016 12:29:07 +0000 (12:29 +0000)]
Merge "Add @TestApi method to Spinner to test whether popup is showing."
Shubham Ajmera [Tue, 12 Apr 2016 12:23:00 +0000 (12:23 +0000)]
Merge "Track libcore change
135ea6cd4f7ebe2f225351a1928d8a62bce5cb00" into nyc-dev
Gustav Sennton [Tue, 12 Apr 2016 11:54:22 +0000 (11:54 +0000)]
Merge "Add more checks for invalid states when reading webview packages config." into nyc-dev am:
67dd518
am:
6b2e812
* commit '
6b2e8122adf7e003d1eef4a646d619d7de000a24':
Add more checks for invalid states when reading webview packages config.
Change-Id: Ie15b8a98e6d16bb5bf3d42f46280d41ed070b5b8
Oleksandr Peletskyi [Tue, 12 Apr 2016 11:48:32 +0000 (11:48 +0000)]
Merge "Fixed cross profile usage of TextClock." into nyc-dev am:
26e3385
am:
08fb03c
* commit '
08fb03c261bab00ebb69bb6449bfcf215e09f604':
Fixed cross profile usage of TextClock.
Change-Id: I724e7310e2e0f5f7a45c1831ad05cea3336af302
Gustav Sennton [Tue, 12 Apr 2016 11:48:30 +0000 (11:48 +0000)]
Merge "Add more checks for invalid states when reading webview packages config." into nyc-dev
am:
67dd518
* commit '
67dd51831e3cc3e3bfb723edace876f2920fb59a':
Add more checks for invalid states when reading webview packages config.
Change-Id: I30dad01087adf0ad30b6750d92e66736a4ee3417
Gustav Sennton [Tue, 12 Apr 2016 11:43:19 +0000 (11:43 +0000)]
Merge "Add more checks for invalid states when reading webview packages config." into nyc-dev
Oleksandr Peletskyi [Tue, 12 Apr 2016 11:43:19 +0000 (11:43 +0000)]
Merge "Fixed cross profile usage of TextClock." into nyc-dev
am:
26e3385
* commit '
26e33855089ddfb0e4fee4ee7df2c316c6f30a82':
Fixed cross profile usage of TextClock.
Change-Id: I35651f1192d5e3890e674755c8897224c5a28db8
Oleksandr Peletskyi [Tue, 12 Apr 2016 11:33:18 +0000 (11:33 +0000)]
Merge "Fixed cross profile usage of TextClock." into nyc-dev
Andrei Stingaceanu [Tue, 12 Apr 2016 10:31:28 +0000 (10:31 +0000)]
Merge "Keyboard shortcuts: minor type change" into nyc-dev am:
73c9391
am:
1ecccb72
* commit '
1ecccb7228f62e14bd234bfa98216cfbd7957859':
Keyboard shortcuts: minor type change
Change-Id: Ia634ae99ed3d5fb00962cc70fb21bff7b61c6ff1
Gustav Sennton [Thu, 7 Apr 2016 15:37:58 +0000 (16:37 +0100)]
Add more checks for invalid states when reading webview packages config.
There should be at least one available-by-default package (otherwise the
user would have to explicitly choose webview implementation before using
webview). Furthermore a fallback package should always be available by
default (otherwise it would have to be chosen by the user to be used
after being enabled).
Bug:
28014401
Change-Id: I90c300898a5be4219317d65f15878e1d421193d7
Andrei Stingaceanu [Tue, 12 Apr 2016 10:26:16 +0000 (10:26 +0000)]
Merge "Keyboard shortcuts: minor type change" into nyc-dev
am:
73c9391
* commit '
73c9391d9bfa0f8f90dc3bee841642f46ba46bda':
Keyboard shortcuts: minor type change
Change-Id: I76311c998e94c75272e99bdec9f44d821a981f19
Andrei Stingaceanu [Tue, 12 Apr 2016 10:19:05 +0000 (10:19 +0000)]
Merge "Keyboard shortcuts: minor type change" into nyc-dev
Andrei Stingaceanu [Tue, 12 Apr 2016 10:07:39 +0000 (11:07 +0100)]
Keyboard shortcuts: minor type change
Stop using Lists.newArrayList() in favor of new ArrayList().
Bug:
28014459
Change-Id: I7e00564b402f90019a89c52f70bc943f88ff75fb
Shubham Ajmera [Tue, 12 Apr 2016 09:10:25 +0000 (10:10 +0100)]
Track libcore change
135ea6cd4f7ebe2f225351a1928d8a62bce5cb00
Bug:
27426743
Change-Id: I4c77de05c99b811f60f2421d1f41e62c1404a4a4
Seigo Nonaka [Tue, 12 Apr 2016 05:29:44 +0000 (05:29 +0000)]
Merge "Fix incorrect boot time locale." into nyc-dev am:
b026b6a
am:
8eaeaf6
* commit '
8eaeaf6ce9cb19650dcbab4a11c8335017a2808c':
Fix incorrect boot time locale.
Change-Id: Iea1de988bd82af57761969e4ad53cea3c2e21e4a
Seigo Nonaka [Tue, 12 Apr 2016 05:24:40 +0000 (05:24 +0000)]
Merge "Fix incorrect boot time locale." into nyc-dev
am:
b026b6a
* commit '
b026b6a40f69d8068e4f9fd6324c81607191995d':
Fix incorrect boot time locale.
Change-Id: I07486e2b553b2c0985b5d3df1ff3557d0696e38f
Seigo Nonaka [Tue, 12 Apr 2016 05:18:23 +0000 (05:18 +0000)]
Merge "Fix incorrect boot time locale." into nyc-dev
Mihai Niță [Tue, 12 Apr 2016 05:08:39 +0000 (05:08 +0000)]
Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev am:
e544d40
am:
e66546c
* commit '
e66546c268ad59f821dc5174786ec37aa698d088':
Use DisplayNameWithDialect only for some locales
Change-Id: I9661a10628471ad1970987e0650f4e660dace431
Mihai Nita [Tue, 12 Apr 2016 05:03:34 +0000 (05:03 +0000)]
Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev
am:
e544d40
* commit '
e544d408c06fe3e6bc3b237f718b56f03f079f29':
Use DisplayNameWithDialect only for some locales
Change-Id: I0611e41a010c6b5c4a937c8c5de501d3749cd438
Mihai Niță [Tue, 12 Apr 2016 04:56:04 +0000 (04:56 +0000)]
Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev
Daichi Hirono [Tue, 12 Apr 2016 04:10:15 +0000 (04:10 +0000)]
Merge "Fix flakiness DocumentLoader#testCancelTask." into nyc-dev am:
6b34b31
am:
dfadee8
* commit '
dfadee879b4b9cb63276e124d89ac5af6eaa4abc':
Fix flakiness DocumentLoader#testCancelTask.
Change-Id: I4d48f093ff7ba1ddad7598cd5abcb9a70ac33357
Daichi Hirono [Tue, 12 Apr 2016 04:05:19 +0000 (04:05 +0000)]
Merge "Fix flakiness DocumentLoader#testCancelTask." into nyc-dev
am:
6b34b31
* commit '
6b34b31059fbe21ed947c0213df56e04f6098f59':
Fix flakiness DocumentLoader#testCancelTask.
Change-Id: Ic9319e8386285afc3ea20350a2d244a917f77812
Daichi Hirono [Tue, 12 Apr 2016 03:54:57 +0000 (03:54 +0000)]
Merge "Fix flakiness DocumentLoader#testCancelTask." into nyc-dev
Daichi Hirono [Tue, 12 Apr 2016 02:29:07 +0000 (11:29 +0900)]
Fix flakiness DocumentLoader#testCancelTask.
For testing, we use blockDocument and unblockDocument test mehtods to
control flow of DocumentLoader's background thread.
Previously testCancelTask may exit before the background thread goes
back from blocking, which causes InterruptedException.
Fixes:
28125289
Change-Id: Id03826733c5b6f1da66b9280838eb1d2897ed5fc
Marco Nelissen [Tue, 12 Apr 2016 02:47:20 +0000 (02:47 +0000)]
Merge "Add javadoc" into nyc-dev am:
5b6fd0f
am:
e111298
* commit '
e1112980d39266862a6a21fa5c974ba68a993a0c':
Add javadoc
Change-Id: I7bc1075285b54b9662bff58b2b69f7d63cb03217
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:41:59 +0000 (02:41 +0000)]
Merge "Fix Patterns.UCS_CHAR character class" into nyc-dev am:
9f98646
am:
c7f1e02
* commit '
c7f1e02dd162eaadca61aa3ea5164ba814d2b4ef':
Fix Patterns.UCS_CHAR character class
Change-Id: Ia18e65d71c97317195dcc7f1e84790681b39b45a
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 Chung [Tue, 12 Apr 2016 02:05:41 +0000 (02:05 +0000)]
Merge "Updating visuals for incompatible apps." into nyc-dev am:
87c343c
am:
10eddc7
* commit '
10eddc7a79d8daef8253c83577746a13abe39090':
Updating visuals for incompatible apps.
Change-Id: I34929fe734f716f59fdc5b4f49e8111628514046
Jorim Jaggi [Tue, 12 Apr 2016 02:05:39 +0000 (02:05 +0000)]
Nuke minimum time for camera double tap gesture am:
4e9817e
am:
3a0c73f
* commit '
3a0c73fc28c6449837df8c6a28f8791a31f47d05':
Nuke minimum time for camera double tap gesture
Change-Id: I68f48cf9d4533c8954f68b38d4b736e68ec455b1
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
Jaewan Kim [Tue, 12 Apr 2016 01:50:16 +0000 (01:50 +0000)]
Merge "PIP: Implement overlay text fade in/out" into nyc-dev am:
52cb241
am:
b6de6cb
* commit '
b6de6cbd09774a960508f8ed706874082224ec3b':
PIP: Implement overlay text fade in/out
Change-Id: Ibd7740fb53f09377ed102e8531f81fcc0c050aec
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:24:23 +0000 (01:24 +0000)]
Merge "Fix selecting with touch in multi-window." into nyc-dev am:
fbd4b55
am:
8d17c6f
* commit '
8d17c6f28fedf6de168d932614d5e50cb6fd35a7':
Fix selecting with touch in multi-window.
Change-Id: I8ffb8b0bf84943b87d859250d737762d3415c618
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:48:10 +0000 (00:48 +0000)]
Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev am:
4b92594
am:
cda996c
* commit '
cda996cff8ab4a0b8009768a6754a031b2c2a731':
Exclude unicode space characters from autoLink URL patterns
Change-Id: I00026490816b2a64424effe34d349870eaeae549
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:22:44 +0000 (00:22 +0000)]
Merge "If a Disk goes away, remove the notifications that asks the user to format it." into nyc-dev am:
75a19a6
am:
8b36a9b
* commit '
8b36a9b11c6f6b3ad7eda4c31d589bafbf69e269':
If a Disk goes away, remove the notifications that asks the user to format it.
Change-Id: Ibd30a85339e68de5623e593a346e62e727eaa734
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:30:46 +0000 (23:30 +0000)]
Merge "Fix notifications that are sent for USER_ALL." into nyc-dev am:
01a1ad5
am:
4ed2fb8
* commit '
4ed2fb8b5cfe63087d155d1f4f2bbe0b8a312980':
Fix notifications that are sent for USER_ALL.
Change-Id: Ifa2314c4f0f913f92f22fe02ff770912e307e913
Makoto Onuki [Mon, 11 Apr 2016 23:30:43 +0000 (23:30 +0000)]
Merge "ShortcutManager: First cut of CTS" into nyc-dev am:
bc20320
am:
0beb56d
* commit '
0beb56d4e49f433759f7c825374c90442f2aed53':
ShortcutManager: First cut of CTS
Change-Id: I048150bf9451e8d28dc599673321bd31f8d119a1
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
Sergei Vasilinetc [Mon, 11 Apr 2016 23:14:43 +0000 (23:14 +0000)]
Merge "Stop comparing Descriptions with memcmp" into nyc-dev am:
e414371
am:
55134c8
* commit '
55134c89fe5a524be26558b4ccccdfa6ffa0105f':
Stop comparing Descriptions with memcmp
Change-Id: I43ea9f9bc2f3f7ba607a85d08dbecf95fcb9e585
Adam Powell [Mon, 11 Apr 2016 23:14:40 +0000 (23:14 +0000)]
Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev am:
e60b8f8
am:
701bb7a
* commit '
701bb7ae13879764b316918042fe8118664d73af':
Prevent duplicate loader onLoadFinished calls on config change
Change-Id: Ia089ebf5b2ba924ceb8e57132ed5c89b7211b8a5
Mihai Nita [Fri, 8 Apr 2016 14:50:44 +0000 (07:50 -0700)]
Use DisplayNameWithDialect only for some locales
Although DisplayNameWithDialect seems to return friendlier, more
"casual" names (e.g. "American English"), the result was inconsistent,
and (at times) debatable. And since this setting affects not only
the language of the translation, but a locale, names like "Flemish"
kind of lost the whole "locale / location" idea.
So we revert to use DisplayName for all but a few selected locales
(that we verified are better with the "dialect" form).
Bug:
27704583
Change-Id: I587081da1293cccac3cdabcd188a9b8160c233ea
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 23:04:31 +0000 (23:04 +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
am:
735a6d8 -s ours
* commit '
735a6d8f37459c929212374f33b3f96114935dcf':
DO NOT MERGE Fix intent filter priorities
Change-Id: I7332957f631737e0199d69e29ee515a9be37733e
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
Fyodor Kupolov [Mon, 11 Apr 2016 22:49:49 +0000 (22:49 +0000)]
Merge "Make AccountManagerServiceTest work again" into nyc-dev am:
518bae5
am:
3c4a3bb
* commit '
3c4a3bb3c55a68146b3bb5febb2fee674fddd8e7':
Make AccountManagerServiceTest work again
Change-Id: Iad16fed7ec0514f62d9cef91e3aeda3b0e7f04e8
Todd Kennedy [Mon, 11 Apr 2016 22:49:47 +0000 (22:49 +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
am:
d83610f -s ours
* commit '
d83610fa94f78666e5c012b2078f6e36e3525b58':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ia6534600287a826f62f7839df7bd89c968425d84
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
Jeff Sharkey [Mon, 11 Apr 2016 22:44:03 +0000 (22:44 +0000)]
Merge "Use callerPackage instead of callerApp." into nyc-dev am:
03c7b09
am:
db60c95
* commit '
db60c9557c717b5a80e83d4dff540f9e9dd7b7e4':
Use callerPackage instead of callerApp.
Change-Id: I166610ef39224452c2f8d85c9908a7c741eb76f5
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
Yohei Yukawa [Mon, 11 Apr 2016 22:44:00 +0000 (22:44 +0000)]
Merge "Shift+Meta+Space should reverse-rotate subtypes part 2." into nyc-dev am:
9dd39f8
am:
a8bee2d
* commit '
a8bee2d76315dd610a54c0d8e137cc21badbde93':
Shift+Meta+Space should reverse-rotate subtypes part 2.
Change-Id: Icf2d45e55259a2f934eea11798f26f1634415b8e
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
Todd Kennedy [Mon, 11 Apr 2016 22:28:11 +0000 (22:28 +0000)]
DO NOT MERGE Fix intent filter priorities am:
eeb970a am:
cd24c4e am:
bd770bc am:
7b068fa -s ours am:
1e07bda
am:
48239b6 -s ours
* commit '
48239b63e8a4de4e0b1241f2f8e611ff2cbbd6e2':
DO NOT MERGE Fix intent filter priorities
Change-Id: I11c54224f79e4291dbb12f0255e3733551ae546b
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
Jeff Sharkey [Mon, 11 Apr 2016 22:17:14 +0000 (22:17 +0000)]
Merge "Abort PRE_BOOT dispatch when user is stopped." into nyc-dev am:
2b05239
am:
a420ed9
* commit '
a420ed9fe621fa09e48cfbfc6d888736e20d7bbf':
Abort PRE_BOOT dispatch when user is stopped.
Change-Id: I63997b27413930b53f7c65b6489245f8e61ee698
OSDN Git Service
