drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
238,252 Commits 1 Branch 0 Tags
Commit Graph

238252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihai Niță
e544d408c0 Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev 2016-04-12 04:56:05 +00:00
Daichi Hirono
6b34b31059 Merge "Fix flakiness DocumentLoader#testCancelTask." into nyc-dev 2016-04-12 03:54:59 +00:00
Daichi Hirono
3edcde2953 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
 2016-04-12 12:38:03 +09:00
Marco Nelissen
5b6fd0fc1a Merge "Add javadoc" into nyc-dev 2016-04-12 02:33:43 +00:00
Siyamed Sinir
9f986466f4 Merge "Fix Patterns.UCS_CHAR character class" into nyc-dev 2016-04-12 02:26:28 +00:00
Winson Chung
87c343cddc Merge "Updating visuals for incompatible apps." into nyc-dev 2016-04-12 01:51:06 +00:00
Winson
9b001396c2 Updating visuals for incompatible apps. 
Bug: 26774190
Change-Id: I688d5dbab0305e794cad832ae92a8e5c9440737a
 2016-04-11 18:48:49 -07:00
Siyamed Sinir
7903aba3ca 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
 2016-04-11 18:45:29 -07:00
Jorim Jaggi
4e9817ec87 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
 2016-04-12 01:38:20 +00:00
Jaewan Kim
52cb241948 Merge "PIP: Implement overlay text fade in/out" into nyc-dev 2016-04-12 01:30:26 +00:00
Tomasz Mikolajewski
fbd4b558d5 Merge "Fix selecting with touch in multi-window." into nyc-dev 2016-04-12 01:06:24 +00:00
Siyamed Sinir
4b92594857 Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev 2016-04-12 00:35:29 +00:00
Philip P. Moltmann
75a19a6fca Merge "If a Disk goes away, remove the notifications that asks the user to format it." into nyc-dev 2016-04-12 00:06:19 +00:00
Jeff Sharkey
01a1ad511e Merge "Fix notifications that are sent for USER_ALL." into nyc-dev 2016-04-11 23:19:07 +00:00
Jeff Sharkey
012bc7bb9f 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
 2016-04-11 17:18:29 -06:00
Mihai Nita
1b2e7adc88 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
 2016-04-11 16:13:54 -07:00
Makoto Onuki
bc20320f7f Merge "ShortcutManager: First cut of CTS" into nyc-dev 2016-04-11 23:11:41 +00:00
Sergei Vasilinetc
e41437167b Merge "Stop comparing Descriptions with memcmp" into nyc-dev 2016-04-11 22:58:57 +00:00
Adam Powell
e60b8f8970 Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev 2016-04-11 22:57:47 +00:00
Todd Kennedy
22acc7fe20 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
 2016-04-11 22:54:43 +00:00
Todd Kennedy
70b32c1609 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
 2016-04-11 22:49:30 +00:00
Todd Kennedy
d359c8a26d 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
 2016-04-11 22:44:03 +00:00
Fyodor Kupolov
518bae5fa4 Merge "Make AccountManagerServiceTest work again" into nyc-dev 2016-04-11 22:38:52 +00:00
Todd Kennedy
06da4fb581 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
 2016-04-11 22:37:53 +00:00
Todd Kennedy
b7575756c4 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
 2016-04-11 22:37:51 +00:00
Fyodor Kupolov
eeca6584cf 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
 2016-04-11 15:33:45 -07:00
Jeff Sharkey
03c7b09a83 Merge "Use callerPackage instead of callerApp." into nyc-dev 2016-04-11 22:33:43 +00:00
Yohei Yukawa
9dd39f8bcc Merge "Shift+Meta+Space should reverse-rotate subtypes part 2." into nyc-dev 2016-04-11 22:33:25 +00:00
Todd Kennedy
3bdb89bd1c 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
 2016-04-11 22:32:47 +00:00
Todd Kennedy
f4753cd263 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
 2016-04-11 22:32:43 +00:00
Philip P. Moltmann
75b230b1d5 If a Disk goes away, remove the notifications that asks the user to format it. 
Fixes: 22091912
Change-Id: I78448427c5d2f02d61251e4d697931d0d4e5c517
 2016-04-11 15:28:05 -07:00
Todd Kennedy
e265f35caa 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
 2016-04-11 22:27:50 +00:00
Todd Kennedy
e5116c2910 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
 2016-04-11 22:27:46 +00:00
Todd Kennedy
be58fe035e 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
 2016-04-11 22:22:35 +00:00
Todd Kennedy
e0481f0ee6 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
 2016-04-11 22:22:30 +00:00
Jeff Sharkey
9323df6e46 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
 2016-04-11 16:20:27 -06:00
Todd Kennedy
620a4ed031 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
 2016-04-11 22:17:20 +00:00
Todd Kennedy
1e07bda8fb 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
 2016-04-11 22:17:19 +00:00
Todd Kennedy
d73c865385 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
 2016-04-11 22:17:19 +00:00
Todd Kennedy
c2cc804407 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
 2016-04-11 22:12:19 +00:00
Todd Kennedy
a73fa08457 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
 2016-04-11 22:12:09 +00:00
Todd Kennedy
7b068fa903 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
 2016-04-11 22:12:05 +00:00
Todd Kennedy
ca133845ef DO NOT MERGE Fix intent filter priorities am: 60351d3 
am: 3dfc6d9

* commit '3dfc6d986f6142b1e0020c9970f626c7c435711e':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Id396cca79db8f830a513746f387fb866c773c778
 2016-04-11 22:06:38 +00:00
Todd Kennedy
bd770bc97b DO NOT MERGE Fix intent filter priorities am: eeb970a 
am: cd24c4e

* commit 'cd24c4ebc0904342b5c9657c43dfa6c07c6e1eec':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Idc3d639cd5494210f06f46b644f465be26eca9b1
 2016-04-11 22:06:35 +00:00
Todd Kennedy
6e0aff30cf 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
 2016-04-11 22:06:35 +00:00
Jeff Sharkey
2b05239ac8 Merge "Abort PRE_BOOT dispatch when user is stopped." into nyc-dev 2016-04-11 22:06:14 +00:00
Jeff Sharkey
100bd9c24a 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
 2016-04-11 16:00:56 -06:00
Todd Kennedy
ebb136cbda DO NOT MERGE Fix intent filter priorities 
am: d6174e7  -s ours

* commit 'd6174e74020aaec97db5780837a3edcd787018bf':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I9d089bfaf20baee25c1999d24020956dcbc2509e
 2016-04-11 22:00:31 +00:00
Todd Kennedy
3dfc6d986f DO NOT MERGE Fix intent filter priorities 
am: 60351d3

* commit '60351d3be29977dfe0b422de797a0429edf500b7':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ieca2ee83f22e5d4083f895f52d42a2f697920be7
 2016-04-11 22:00:27 +00:00
Todd Kennedy
cd24c4ebc0 DO NOT MERGE Fix intent filter priorities 
am: eeb970a

* commit 'eeb970ada10d37495ad7a8a4b14ad0506b640eea':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I22cfcc61e9ec37242e0e47ef732c9364bdb8a886
 2016-04-11 22:00:26 +00:00