OSDN Git Service

android-x86/frameworks-base.git
8 years agoMark DocumentsUI as a "privileged" app.
Steve McKay [Wed, 13 Apr 2016 17:20:46 +0000 (10:20 -0700)]
Mark DocumentsUI as a "privileged" app.

This fixes the issues with CTS resulting from the change to intent filtering.
Bug: 28081616

Change-Id: I81f87ff56b5fbb0d526863da44a2fcef29a3aa2c

8 years agoMerge "remove special case code for groups." into nyc-dev
Chris Wren [Tue, 12 Apr 2016 15:25:15 +0000 (15:25 +0000)]
Merge "remove special case code for groups." into nyc-dev

8 years agoMerge "Customizes input extract edit view for Wear" into nyc-dev
Mark Renouf [Tue, 12 Apr 2016 15:18:17 +0000 (15:18 +0000)]
Merge "Customizes input extract edit view for Wear" into nyc-dev

8 years agoMerge "Add initial unit tests for WebViewUpdateService." into nyc-dev
Gustav Sennton [Tue, 12 Apr 2016 15:17:04 +0000 (15:17 +0000)]
Merge "Add initial unit tests for WebViewUpdateService." into nyc-dev

8 years agoCustomizes input extract edit view for Wear
Mark Renouf [Mon, 11 Apr 2016 20:03:26 +0000 (16:03 -0400)]
Customizes input extract edit view for Wear

Provides an alternate presentation of the extract edit area
of an input method window, designed for sub 250dp width screens.

An icon is used on a round material style button in place of a text
action, providing more horizontal space for the editing area.

BUG: 28098677
(cherry picked from commit fd71a6a5d99bad5d3ab32edc328fb5b026b66215)

Change-Id: I0e559d17f78d1a48b37979a49e11ae1aad7503f4

8 years agoMerge changes from topic 'vr-fixes' into nyc-dev
Daniel Sandler [Tue, 12 Apr 2016 14:57:40 +0000 (14:57 +0000)]
Merge changes from topic 'vr-fixes' into nyc-dev

* changes:
  Suppress immersive mode confirmation in VR mode.
  Suppress heads-up notifications in VR mode.

8 years agoMerge "Framework-side of SurfaceView#getBitmap" into nyc-dev
John Reck [Tue, 12 Apr 2016 14:36:10 +0000 (14:36 +0000)]
Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev

8 years agoremove special case code for groups.
Chris Wren [Mon, 11 Apr 2016 20:48:24 +0000 (16:48 -0400)]
remove special case code for groups.

Once all the platforms as special, none of them will be.

Bug: 26919636
Change-Id: I70eb05126184feb2af310e71f0ffd82ab9dcebc6

8 years agoAdd initial unit tests for WebViewUpdateService.
Gustav Sennton [Thu, 7 Apr 2016 14:56:10 +0000 (15:56 +0100)]
Add initial unit tests for WebViewUpdateService.

The logic in the WebViewUpdateService is now more complex and there
are lots of edge cases that should be tested to make sure we don't
regress anything.

Also refrain from running fallback logic on boot if fallback logic not
enabled (bug found through a failing test, yeeah buddy!).

Catch uncaught MissingWebViewException (very timing-dependent!) and add
test for this.

Add tests for:
Some package setups (single package, non-default vs. default packages,
    valid vs. invalid packages).
Ensure correct error codes used
Switching provider through settings-method
Switching provider through adding more prioritized provider
Switching provider in the middle of already running webview preparation
Ensure fallback logic is run when enabled and not run when disabled (at
    boot, packageStateChanged, and when adding a new user).

Bug: 27635535

Change-Id: I275ecb0f6129f71258da0fa053e7f7b36a675886

8 years agoMerge "Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00" into nyc-dev
Shubham Ajmera [Tue, 12 Apr 2016 12:23:00 +0000 (12:23 +0000)]
Merge "Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00" into nyc-dev

8 years agoMerge "Add more checks for invalid states when reading webview packages config."...
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

8 years agoMerge "Fixed cross profile usage of TextClock." into nyc-dev
Oleksandr Peletskyi [Tue, 12 Apr 2016 11:33:18 +0000 (11:33 +0000)]
Merge "Fixed cross profile usage of TextClock." into nyc-dev

8 years agoAdd more checks for invalid states when reading webview packages config.
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

8 years agoMerge "Keyboard shortcuts: minor type change" into nyc-dev
Andrei Stingaceanu [Tue, 12 Apr 2016 10:19:05 +0000 (10:19 +0000)]
Merge "Keyboard shortcuts: minor type change" into nyc-dev

8 years agoKeyboard shortcuts: minor type change
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

8 years agoTrack libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00
Shubham Ajmera [Tue, 12 Apr 2016 09:10:25 +0000 (10:10 +0100)]
Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00

Bug: 27426743
Change-Id: I4c77de05c99b811f60f2421d1f41e62c1404a4a4

8 years agoMerge "Fix incorrect boot time locale." into nyc-dev
Seigo Nonaka [Tue, 12 Apr 2016 05:18:23 +0000 (05:18 +0000)]
Merge "Fix incorrect boot time locale." into nyc-dev

8 years agoMerge "Use DisplayNameWithDialect only for some locales" into nyc-dev
Mihai Niță [Tue, 12 Apr 2016 04:56:04 +0000 (04:56 +0000)]
Merge "Use DisplayNameWithDialect only for some locales" into nyc-dev

8 years agoMerge "Fix flakiness DocumentLoader#testCancelTask." into nyc-dev
Daichi Hirono [Tue, 12 Apr 2016 03:54:57 +0000 (03:54 +0000)]
Merge "Fix flakiness DocumentLoader#testCancelTask." into nyc-dev

8 years agoFix flakiness DocumentLoader#testCancelTask.
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

8 years agoMerge "Add javadoc" into nyc-dev
Marco Nelissen [Tue, 12 Apr 2016 02:33:41 +0000 (02:33 +0000)]
Merge "Add javadoc" into nyc-dev

8 years agoMerge "Fix Patterns.UCS_CHAR character class" 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

8 years agoMerge "Updating visuals for incompatible apps." into nyc-dev
Winson Chung [Tue, 12 Apr 2016 01:51:04 +0000 (01:51 +0000)]
Merge "Updating visuals for incompatible apps." into nyc-dev

8 years agoUpdating visuals for incompatible apps.
Winson [Fri, 8 Apr 2016 21:54:02 +0000 (14:54 -0700)]
Updating visuals for incompatible apps.

Bug: 26774190
Change-Id: I688d5dbab0305e794cad832ae92a8e5c9440737a

8 years agoFix Patterns.UCS_CHAR character class
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

8 years agoNuke minimum time for camera double tap gesture
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

8 years agoMerge "PIP: Implement overlay text fade in/out" into nyc-dev
Jaewan Kim [Tue, 12 Apr 2016 01:30:24 +0000 (01:30 +0000)]
Merge "PIP: Implement overlay text fade in/out" into nyc-dev

8 years agoMerge "Fix selecting with touch in multi-window." into nyc-dev
Tomasz Mikolajewski [Tue, 12 Apr 2016 01:06:22 +0000 (01:06 +0000)]
Merge "Fix selecting with touch in multi-window." into nyc-dev

8 years agoMerge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev
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

8 years agoMerge "If a Disk goes away, remove the notifications that asks the user to format...
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

8 years agoMerge "Fix notifications that are sent for USER_ALL." into nyc-dev
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

8 years agoFix notifications that are sent for USER_ALL.
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

8 years agoUse DisplayNameWithDialect only for some locales
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

8 years agoMerge "ShortcutManager: First cut of CTS" into nyc-dev
Makoto Onuki [Mon, 11 Apr 2016 23:11:40 +0000 (23:11 +0000)]
Merge "ShortcutManager: First cut of CTS" into nyc-dev

8 years agoFramework-side of SurfaceView#getBitmap
John Reck [Thu, 31 Mar 2016 23:36:16 +0000 (16:36 -0700)]
Framework-side of SurfaceView#getBitmap

Bug: 27708453

Change-Id: Ie6fd7eca522d3e6549d8af587c975fd7e6053649

8 years agoMerge "Stop comparing Descriptions with memcmp" into nyc-dev
Sergei Vasilinetc [Mon, 11 Apr 2016 22:58:56 +0000 (22:58 +0000)]
Merge "Stop comparing Descriptions with memcmp" into nyc-dev

8 years agoMerge "Prevent duplicate loader onLoadFinished calls on config change" 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

8 years agoDO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s...
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

8 years agoDO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s...
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

8 years agoDO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s...
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

8 years agoMerge "Make AccountManagerServiceTest work again" into nyc-dev
Fyodor Kupolov [Mon, 11 Apr 2016 22:38:50 +0000 (22:38 +0000)]
Merge "Make AccountManagerServiceTest work again" into nyc-dev

8 years agoDO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff...
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

8 years agoDO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s...
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

8 years agoMake AccountManagerServiceTest work again
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

8 years agoMerge "Use callerPackage instead of callerApp." into nyc-dev
Jeff Sharkey [Mon, 11 Apr 2016 22:33:42 +0000 (22:33 +0000)]
Merge "Use callerPackage instead of callerApp." into nyc-dev

8 years agoMerge "Shift+Meta+Space should reverse-rotate subtypes part 2." 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

8 years agoDO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s...
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

8 years agoDO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff...
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

8 years agoIf a Disk goes away, remove the notifications that asks the user to format it.
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

8 years agoDO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s...
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

8 years agoDO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff...
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

8 years agoDO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s...
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

8 years agoDO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff...
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

8 years agoUse callerPackage instead of callerApp.
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

8 years agoDO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s...
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

8 years agoDO NOT MERGE Fix intent filter priorities am: eeb970a am: cd24c4e am: bd770bc
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

8 years agoDO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3
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

8 years agoDO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9
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

8 years agoDO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c
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

8 years agoDO NOT MERGE Fix intent filter priorities am: eeb970a am: cd24c4e
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

8 years agoDO NOT MERGE Fix intent filter priorities am: 60351d3
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

8 years agoDO NOT MERGE Fix intent filter priorities am: eeb970a
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

8 years agoDO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours
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

8 years agoMerge "Abort PRE_BOOT dispatch when user is stopped." into nyc-dev
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

8 years agoAbort PRE_BOOT dispatch when user is stopped.
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

8 years agoDO NOT MERGE Fix intent filter priorities
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

8 years agoDO NOT MERGE Fix intent filter priorities
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

8 years agoDO NOT MERGE Fix intent filter priorities
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

8 years agoAdd javadoc
Marco Nelissen [Mon, 11 Apr 2016 21:41:33 +0000 (14:41 -0700)]
Add javadoc

Bug: 27952005
Change-Id: Ia1b6b6a723c30979c7c7ad7c0b2c0e7e295f0831

8 years agoShortcutManager: First cut of CTS
Makoto Onuki [Mon, 11 Apr 2016 21:03:46 +0000 (14:03 -0700)]
ShortcutManager: First cut of CTS

Bug 27548047

Change-Id: Idd7a768ea4fee44c2cf6e3bd473cea9e67f5f7cd

8 years agoMerge "Scale wallpaper crop to device-suitable size" into nyc-dev
Chris Tate [Mon, 11 Apr 2016 21:45:09 +0000 (21:45 +0000)]
Merge "Scale wallpaper crop to device-suitable size" into nyc-dev

8 years agoAdding vibration after successful dock/undock gesture.
Winson [Mon, 11 Apr 2016 19:57:31 +0000 (12:57 -0700)]
Adding vibration after successful dock/undock gesture.

Bug: 27588627
Change-Id: I1dd149d4f7e7fccf8ec61b59bab7c14a90b77e45

8 years agoMerge "Fix issue #28118215: Crash during system boot due to null carrier apps" into...
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

8 years agoMerge "Add settings for SUW data control." 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

8 years agoPrevent duplicate loader onLoadFinished calls on config change
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

8 years agoMerge "NanoApp: Make indentation consistent" into nyc-dev
Greg Kaiser [Mon, 11 Apr 2016 21:21:36 +0000 (21:21 +0000)]
Merge "NanoApp: Make indentation consistent" into nyc-dev

8 years agoMerge "Apply clip at reorder barriers to shadows" 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

8 years agoMerge "Updates to sound trigger test app." 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

8 years agoMerge "Revert "Make stopped state a first-class thing"" into nyc-dev
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

8 years agoRevert "Make stopped state a first-class thing"
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

8 years agoMerge "Rate-limit how often we collect wtf() logs." into nyc-dev
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

8 years agoMerge "Don't enable new folder in downloads..." into nyc-dev
Steve McKay [Mon, 11 Apr 2016 20:41:29 +0000 (20:41 +0000)]
Merge "Don't enable new folder in downloads..." into nyc-dev

8 years agoRate-limit how often we collect wtf() logs.
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: 28117774280525462799471727381069
Change-Id: Ic91b23fe7ee26818083a8d40fd4850fcb9d93643

8 years agoMerge "Follow the constructor signature change in Minikin." into nyc-dev
Raph Levien [Mon, 11 Apr 2016 20:39:49 +0000 (20:39 +0000)]
Merge "Follow the constructor signature change in Minikin." into nyc-dev

8 years agoShift+Meta+Space should reverse-rotate subtypes part 2.
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

8 years agoMerge "Clean up AudioRouting API internals." into nyc-dev
Jeff Sharkey [Mon, 11 Apr 2016 20:33:49 +0000 (20:33 +0000)]
Merge "Clean up AudioRouting API internals." into nyc-dev

8 years agoMerge "contexthub: nanohub HAL redefined hub_app_name_t; keep in sync" into nyc-dev
Alexey Polyudov [Mon, 11 Apr 2016 20:28:56 +0000 (20:28 +0000)]
Merge "contexthub: nanohub HAL redefined hub_app_name_t; keep in sync" into nyc-dev

8 years agoMerge "media: update VP9 CodecProfileLevel" into nyc-dev
Hangyu Kuang [Mon, 11 Apr 2016 20:22:16 +0000 (20:22 +0000)]
Merge "media: update VP9 CodecProfileLevel" into nyc-dev

8 years agoStop comparing Descriptions with memcmp
sergeyv [Fri, 8 Apr 2016 01:06:53 +0000 (18:06 -0700)]
Stop comparing Descriptions with memcmp

bug:27894959
Change-Id: I379c11381c08f6f77577a914638b32415768f26e

8 years agoFix issue #28118215: Crash during system boot due to null carrier apps
Dianne Hackborn [Mon, 11 Apr 2016 20:02:08 +0000 (13:02 -0700)]
Fix issue #28118215: Crash during system boot due to null carrier apps

Change-Id: I607ccc4baf769c2fb78b0d745bf9fddc3d240855

8 years agoMerge "Rename enableAutoJoinWhenAssociated() to setEnableAutoJoinWhenAssociated(...
Samuel Tan [Mon, 11 Apr 2016 19:54:20 +0000 (19:54 +0000)]
Merge "Rename enableAutoJoinWhenAssociated() to setEnableAutoJoinWhenAssociated()" into nyc-dev

8 years agoNanoApp: Make indentation consistent
Greg Kaiser [Mon, 11 Apr 2016 19:49:21 +0000 (12:49 -0700)]
NanoApp: Make indentation consistent

Four spaces is our style standard.

Change-Id: I94f4493268e29b7de5d4fc0f5ef98637997b3957

8 years agoMerge "TIF: Add equals() and hashCode() for comparisons" into nyc-dev
Shubang Lu [Mon, 11 Apr 2016 19:37:24 +0000 (19:37 +0000)]
Merge "TIF: Add equals() and hashCode() for comparisons" into nyc-dev

8 years agoMerge "Remove QS tiles that get uninstalled" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 19:37:11 +0000 (19:37 +0000)]
Merge "Remove QS tiles that get uninstalled" into nyc-dev

8 years agoApply clip at reorder barriers to shadows
Chris Craik [Mon, 11 Apr 2016 19:24:23 +0000 (12:24 -0700)]
Apply clip at reorder barriers to shadows

Fixes: 28004930

Change-Id: I208b78430c770a3135afd68c53cf8ff3fba50c52

8 years agoRemove QS tiles that get uninstalled
Jason Monk [Mon, 11 Apr 2016 19:30:38 +0000 (15:30 -0400)]
Remove QS tiles that get uninstalled

Change-Id: Ib4c7250a38c0630b0d828f1f55ce5c0dc4d3bb44
Fixes: 27893200

8 years agoSuppress immersive mode confirmation in VR mode.
Dan Sandler [Mon, 11 Apr 2016 19:30:12 +0000 (15:30 -0400)]
Suppress immersive mode confirmation in VR mode.

Change-Id: I5046d3f60727bded484cb11233638be0e24ef0d8
Fixes: 28052143

8 years agoMerge "Allow deleting accounts when user is locked" into nyc-dev
Fyodor Kupolov [Mon, 11 Apr 2016 19:16:16 +0000 (19:16 +0000)]
Merge "Allow deleting accounts when user is locked" into nyc-dev

8 years agoMerge "Don't get application info for the system" into nyc-dev
Julia Reynolds [Mon, 11 Apr 2016 19:09:54 +0000 (19:09 +0000)]
Merge "Don't get application info for the system" into nyc-dev

8 years agoMerge "Fix some jank in quick settings" into nyc-dev
Jorim Jaggi [Mon, 11 Apr 2016 19:08:06 +0000 (19:08 +0000)]
Merge "Fix some jank in quick settings" into nyc-dev