OSDN Git Service

android-x86/frameworks-base.git
8 years agoRefresh directory changes on Mtp when a child is deleted or created.
Tomasz Mikolajewski [Tue, 1 Sep 2015 04:45:33 +0000 (13:45 +0900)]
Refresh directory changes on Mtp when a child is deleted or created.

Change-Id: I0325c60ac142368c2e61fcf9efa751f678f3f3a3

8 years agoMerge "Fix uploading multiple files via MtpDocumentsProvider."
Tomasz Mikolajewski [Tue, 1 Sep 2015 03:41:56 +0000 (03:41 +0000)]
Merge "Fix uploading multiple files via MtpDocumentsProvider."

8 years agoMerge "Remove redundand code from TestMtpManager."
Tomasz Mikolajewski [Tue, 1 Sep 2015 03:40:48 +0000 (03:40 +0000)]
Merge "Remove redundand code from TestMtpManager."

8 years agoMerge "Remove MtpDocument."
Tomasz Mikolajewski [Tue, 1 Sep 2015 03:39:26 +0000 (03:39 +0000)]
Merge "Remove MtpDocument."

8 years agoFix uploading multiple files via MtpDocumentsProvider.
Tomasz Mikolajewski [Mon, 31 Aug 2015 01:59:43 +0000 (10:59 +0900)]
Fix uploading multiple files via MtpDocumentsProvider.

Uploading was breaking as SendObject request was not being sent directly
after SendObjectInfo which is assumed by the MTP stack in Android.

Change-Id: I36b94f56682e79dec38add9be5f70f55d07e22e7

8 years agoRemove redundand code from TestMtpManager.
Tomasz Mikolajewski [Wed, 26 Aug 2015 07:50:31 +0000 (16:50 +0900)]
Remove redundand code from TestMtpManager.

Change-Id: I487dbab4366375c80d82d26ed9757e5ba17a2c56

8 years agoRemove MtpDocument.
Tomasz Mikolajewski [Tue, 25 Aug 2015 09:34:30 +0000 (18:34 +0900)]
Remove MtpDocument.

Change-Id: Ie4b0e55f6ff2c7b323cf767a5ed3d3c61c12734d

8 years agoMerge "Correct isRunning() behavior for AnimatorSet"
Doris Liu [Mon, 31 Aug 2015 23:57:17 +0000 (23:57 +0000)]
Merge "Correct isRunning() behavior for AnimatorSet"

8 years agoMerge "Add initial GPU/text/invalidate UiBench workloads"
Chris Craik [Mon, 31 Aug 2015 23:34:32 +0000 (23:34 +0000)]
Merge "Add initial GPU/text/invalidate UiBench workloads"

8 years agoMerge "Fix bug in Owners"
Makoto Onuki [Mon, 31 Aug 2015 23:11:15 +0000 (23:11 +0000)]
Merge "Fix bug in Owners"

8 years agoAdd initial GPU/text/invalidate UiBench workloads
Chris Craik [Mon, 31 Aug 2015 21:51:03 +0000 (14:51 -0700)]
Add initial GPU/text/invalidate UiBench workloads

Change-Id: I6c6f1f90973dc67014d0fdbf0028052a8341c292

8 years agoMerge "Refactor DirectoryFragment."
Ben Kwa [Mon, 31 Aug 2015 22:51:11 +0000 (22:51 +0000)]
Merge "Refactor DirectoryFragment."

8 years agoRefactor DirectoryFragment.
Ben Kwa [Thu, 27 Aug 2015 23:04:46 +0000 (16:04 -0700)]
Refactor DirectoryFragment.

Consolidate data logic in a DirectoryFragment.Model class, instead of
having it spread out between the DirectoryFragment and the DocumentsAdapter.

BUG=23518578

Change-Id: I7c2b6c7aa388f5872ac18c320b86445f3c354792

8 years agoFix bug in Owners
Makoto Onuki [Mon, 31 Aug 2015 21:38:38 +0000 (14:38 -0700)]
Fix bug in Owners

It was always failing to read policy files.

Bug 23432442

Change-Id: Ia71a746bbed279c4b27a9ebdf454a3cb4dfa786d

8 years agoMerge "QS prototype work"
Jason Monk [Mon, 31 Aug 2015 20:38:17 +0000 (20:38 +0000)]
Merge "QS prototype work"

8 years agoQS prototype work
Jason Monk [Tue, 18 Aug 2015 16:33:50 +0000 (12:33 -0400)]
QS prototype work

 - All work is defaulted to off, with no changes to UI
 - Add 'quick' QS tiles, which have circles around them and no text,
   they just toggle things like wifi
 - Add tuner switch to hide brightness from QS panel
 - Add paginated QS layout, it shows a row of the circle tiles across
   the top, followed by 3 rows of normal tiles, following pages
   have 4 rows, dual tiles are not allowed in this mode
 - Add tuner switch to turn on paging for QS, and set to a set of tiles
   that look ok with it

Change-Id: Ia2d2eb36f8953033ce4810cd3628fcb86315fe46

8 years agoMerge "Rename DeviceOwner to Owners"
Makoto Onuki [Mon, 31 Aug 2015 20:24:39 +0000 (20:24 +0000)]
Merge "Rename DeviceOwner to Owners"

8 years agoMerge "Dragging the best available activity from Recents (to Pinned)."
Vadim Tryshev [Mon, 31 Aug 2015 19:17:37 +0000 (19:17 +0000)]
Merge "Dragging the best available activity from Recents (to Pinned)."

8 years agoDragging the best available activity from Recents (to Pinned).
Vadim Tryshev [Fri, 28 Aug 2015 22:15:19 +0000 (15:15 -0700)]
Dragging the best available activity from Recents (to Pinned).

I experimented with various apps that have multiple activities, and
found the approach that seem to work fine in most cases.

The general idea is to preserve the task's activity if it's launcheable,
or to drag the apps launch activity otherwise.

Bug: 20024603
Change-Id: Ieb64423874f55f64f089ce1db6cf205469756419

8 years agoMerge "Switch DocumentsUI over to use AppCompat themes."
Ben Kwa [Mon, 31 Aug 2015 18:46:07 +0000 (18:46 +0000)]
Merge "Switch DocumentsUI over to use AppCompat themes."

8 years agoRename DeviceOwner to Owners
Makoto Onuki [Mon, 31 Aug 2015 18:44:44 +0000 (11:44 -0700)]
Rename DeviceOwner to Owners

Bug 23432442

Change-Id: Ic59c880d45126fbcf50b1bd31e37b2b64e2f3a6d

8 years agoSwitch DocumentsUI over to use AppCompat themes.
Ben Kwa [Mon, 24 Aug 2015 17:15:56 +0000 (10:15 -0700)]
Switch DocumentsUI over to use AppCompat themes.

Switches from Material to AppCompat themes in order to start using
Snackbar.

Also, factor the common bits out of DocumentsNonDialogTheme and
FilesTheme, and make the theme names clearer.

BUG=23518578

Change-Id: I94a00e910469c57315823ae9df33024f2c7360ee

8 years agoMerge "Tweak systrace calls"
Todd Kennedy [Mon, 31 Aug 2015 17:58:23 +0000 (17:58 +0000)]
Merge "Tweak systrace calls"

8 years agoMerge "Implement missing jumpToCurrentState() in LayerDrawable"
Alan Viverette [Mon, 31 Aug 2015 16:43:28 +0000 (16:43 +0000)]
Merge "Implement missing jumpToCurrentState() in LayerDrawable"

8 years agoMerge "Clean up Gps/Flp Hardware on shut-down."
Daniel Estrada Alva [Mon, 31 Aug 2015 16:42:14 +0000 (16:42 +0000)]
Merge "Clean up Gps/Flp Hardware on shut-down."

8 years agoImplement missing jumpToCurrentState() in LayerDrawable
Alan Viverette [Mon, 31 Aug 2015 16:39:27 +0000 (12:39 -0400)]
Implement missing jumpToCurrentState() in LayerDrawable

Bug: 23674536
Change-Id: Icf1a4248d82484e48a958ce019b1f9cb0caeac9e

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 31 Aug 2015 16:06:06 +0000 (16:06 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 31 Aug 2015 16:03:15 +0000 (11:03 -0500)]
Import translations. DO NOT MERGE

Change-Id: I92853b63a9260a7faf64a8b2bd19c9390318f864
Auto-generated-cl: translation import

8 years agoAdd missing @param in ResourceManager, set InflateException source
Alan Viverette [Mon, 31 Aug 2015 15:36:16 +0000 (11:36 -0400)]
Add missing @param in ResourceManager, set InflateException source

Bug: 11695070
Change-Id: I94a4980688a952c1f59f1cb15cf2192e3c51de90

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 31 Aug 2015 12:44:20 +0000 (12:44 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 31 Aug 2015 12:43:06 +0000 (05:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6c5aed9a246676b5b0c3c636f7ef034da7d1de01
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 31 Aug 2015 12:32:09 +0000 (05:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7cab335626c677ed5dca5571a042a811a8f6811c
Auto-generated-cl: translation import

8 years agoMerge "Fix remaining renames in MtpDocumentsProvider tests."
Tomasz Mikolajewski [Mon, 31 Aug 2015 04:34:44 +0000 (04:34 +0000)]
Merge "Fix remaining renames in MtpDocumentsProvider tests."

8 years agoMerge "Add simple unit test for MtpManager which uses real MTP device."
Daichi Hirono [Mon, 31 Aug 2015 04:31:17 +0000 (04:31 +0000)]
Merge "Add simple unit test for MtpManager which uses real MTP device."

8 years agoFix remaining renames in MtpDocumentsProvider tests.
Tomasz Mikolajewski [Mon, 31 Aug 2015 04:25:59 +0000 (13:25 +0900)]
Fix remaining renames in MtpDocumentsProvider tests.

Change-Id: I7093654c35faa750c12f75da57ddfa2828c474b0

8 years agoAdd simple unit test for MtpManager which uses real MTP device.
Daichi Hirono [Fri, 28 Aug 2015 06:47:33 +0000 (15:47 +0900)]
Add simple unit test for MtpManager which uses real MTP device.

BUG=23536467

Change-Id: I46f207b09d3d0706ccf8cb02d8dedcf6eb354a89

8 years agoMerge "Fix member naming style in PipeManagerTest."
Daichi Hirono [Mon, 31 Aug 2015 03:36:23 +0000 (03:36 +0000)]
Merge "Fix member naming style in PipeManagerTest."

8 years agoFix member naming style in PipeManagerTest.
Daichi Hirono [Mon, 31 Aug 2015 03:32:39 +0000 (12:32 +0900)]
Fix member naming style in PipeManagerTest.

BUG=None

Change-Id: I962a37667f110ee17e62e24517db6a85aa227b9f

8 years agoMerge "Add activity to show the result of tests."
Daichi Hirono [Mon, 31 Aug 2015 03:31:08 +0000 (03:31 +0000)]
Merge "Add activity to show the result of tests."

8 years agoAdd activity to show the result of tests.
Daichi Hirono [Fri, 28 Aug 2015 06:02:46 +0000 (15:02 +0900)]
Add activity to show the result of tests.

When testing a real MTP device, we cannot obtain test results by using the USB
port because the USB port is occupied by the MTP devcie. The CL adds an activity
to test package that shows test results.

BUG=23536467

Change-Id: I0e53c2de122cb3afd52f22bedd93ece53aaeb525

8 years agoam 07d04774: am 59f3c342: am 6611cff4: am d9efca99: Merge "Support uneditable enhance...
Pavel Zhamaitsiak [Sat, 29 Aug 2015 23:19:03 +0000 (23:19 +0000)]
am 07d04774: am 59f3c342: am 6611cff4: am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev

* commit '07d04774dac30bf11523de1f4bea710ce276c207':
  Support uneditable enhanced 4g lte mode config

8 years agoam 67953778: (-s ours) am 999576d0: (-s ours) am 8038391a: (-s ours) am 469fa946...
Geoff Mendal [Sat, 29 Aug 2015 23:18:56 +0000 (23:18 +0000)]
am 67953778: (-s ours) am 999576d0: (-s ours) am 8038391a: (-s ours) am 469fa946: (-s ours) Import translations. DO NOT MERGE

* commit '67953778546ab2ac3dfbc4aa61b236895fd1ac2b':
  Import translations. DO NOT MERGE

8 years agoam 59f3c342: am 6611cff4: am d9efca99: Merge "Support uneditable enhanced 4g lte...
Pavel Zhamaitsiak [Sat, 29 Aug 2015 23:09:57 +0000 (23:09 +0000)]
am 59f3c342: am 6611cff4: am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev

* commit '59f3c3429bf61ff4eb6f5d16abba01cb58cc5ee9':
  Support uneditable enhanced 4g lte mode config

8 years agoam 999576d0: (-s ours) am 8038391a: (-s ours) am 469fa946: (-s ours) Import translati...
Geoff Mendal [Sat, 29 Aug 2015 23:09:51 +0000 (23:09 +0000)]
am 999576d0: (-s ours) am 8038391a: (-s ours) am 469fa946: (-s ours) Import translations. DO NOT MERGE

* commit '999576d050376f6b3e78827f9a0353b376ace1e4':
  Import translations. DO NOT MERGE

8 years agoam 6611cff4: am d9efca99: Merge "Support uneditable enhanced 4g lte mode config"...
Pavel Zhamaitsiak [Sat, 29 Aug 2015 22:57:34 +0000 (22:57 +0000)]
am 6611cff4: am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev

* commit '6611cff402f0edeff85e7a9e6fedc6eeb8f8b1f1':
  Support uneditable enhanced 4g lte mode config

8 years agoam 8038391a: (-s ours) am 469fa946: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 29 Aug 2015 22:57:29 +0000 (22:57 +0000)]
am 8038391a: (-s ours) am 469fa946: (-s ours) Import translations. DO NOT MERGE

* commit '8038391a0841f6a038a9dd3592675e794678835b':
  Import translations. DO NOT MERGE

8 years agoam d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev
Pavel Zhamaitsiak [Sat, 29 Aug 2015 22:44:41 +0000 (22:44 +0000)]
am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev

* commit 'd9efca994f99523288986f29128d696440ee4150':
  Support uneditable enhanced 4g lte mode config

8 years agoam 469fa946: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 29 Aug 2015 22:44:37 +0000 (22:44 +0000)]
am 469fa946: (-s ours) Import translations. DO NOT MERGE

* commit '469fa946132b34165ea014e2eef7cd94f59171c1':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 29 Aug 2015 19:32:04 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 29 Aug 2015 17:57:24 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie00c5897e901dbc7b983779e9f98646f3dff09bc
Auto-generated-cl: translation import

8 years agoMerge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev
Pavel Zhamaitsiak [Sat, 29 Aug 2015 15:40:05 +0000 (15:40 +0000)]
Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 29 Aug 2015 15:37:22 +0000 (08:37 -0700)]
Import translations. DO NOT MERGE

Change-Id: I770ccd06cea0e57fa92434a33e4e183d79010921
Auto-generated-cl: translation import

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 29 Aug 2015 14:34:15 +0000 (14:34 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 29 Aug 2015 14:32:13 +0000 (07:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibaa344fa8a1adf5fb4cebc6435188a45e6d69fa1
Auto-generated-cl: translation import

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 29 Aug 2015 14:21:08 +0000 (14:21 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 29 Aug 2015 14:14:27 +0000 (07:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2446db9d1ecc2efedeb811dc2d72b994241f0acf
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 29 Aug 2015 13:48:39 +0000 (06:48 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia1726fc0d4f959503a4e904b4cd493f6b2a11d9f
Auto-generated-cl: translation import

8 years agoam fe17d791: am 098cb247: am 3396a11e: am 3656975e: Merge "Run callbacks from fingerp...
Jim Miller [Sat, 29 Aug 2015 01:54:10 +0000 (01:54 +0000)]
am fe17d791: am 098cb247: am 3396a11e: am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev

* commit 'fe17d79173e753b6b2752c1a806a6f97a59f35b8':
  Run callbacks from fingerprintd through handler.

8 years agoam 098cb247: am 3396a11e: am 3656975e: Merge "Run callbacks from fingerprintd through...
Jim Miller [Sat, 29 Aug 2015 01:46:48 +0000 (01:46 +0000)]
am 098cb247: am 3396a11e: am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev

* commit '098cb2470fa8f13bb3da6267dd33495391b508cc':
  Run callbacks from fingerprintd through handler.

8 years agoam 3396a11e: am 3656975e: Merge "Run callbacks from fingerprintd through handler...
Jim Miller [Sat, 29 Aug 2015 01:37:41 +0000 (01:37 +0000)]
am 3396a11e: am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev

* commit '3396a11e354fe4d6243749579c976b341d1007a0':
  Run callbacks from fingerprintd through handler.

8 years agoam 80bed748: am 2e80aa73: am 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the...
Ian Pedowitz [Sat, 29 Aug 2015 01:34:32 +0000 (01:34 +0000)]
am 80bed748: am 2e80aa73: am 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev

* commit '80bed748170b24f57d6a2db92b00c6be34e8f36a':
  Show the ResolverActivity in dock mode

8 years agoam 4845fa72: am b8ae1879: Merge "Fix android:theme parsing for custom views." into...
Deepanshu Gupta [Sat, 29 Aug 2015 01:28:06 +0000 (01:28 +0000)]
am 4845fa72: am b8ae1879: Merge "Fix android:theme parsing for custom views." into mnc-ub-dev

* commit '4845fa72c236f7c70572a9ae24a8e183edfd485f':
  Fix android:theme parsing for custom views.

8 years agoam 6dea7ba0: (-s ours) am 4f8653c3: (-s ours) am 3fc6f441: (-s ours) Merge "Do not...
Christopher Wiley [Sat, 29 Aug 2015 01:27:57 +0000 (01:27 +0000)]
am 6dea7ba0: (-s ours) am 4f8653c3: (-s ours) am 3fc6f441: (-s ours) Merge "Do not merge namespaces"

* commit '6dea7ba05c4f2452c90e05da1761090973c8e6b5':
  Do not merge namespaces

8 years agoam 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev
Jim Miller [Sat, 29 Aug 2015 01:26:21 +0000 (01:26 +0000)]
am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev

* commit '3656975ef879175aa81cf6362a6a7ffc4a5a99fc':
  Run callbacks from fingerprintd through handler.

8 years agoMerge "Run callbacks from fingerprintd through handler." into mnc-dr-dev
Jim Miller [Sat, 29 Aug 2015 01:14:45 +0000 (01:14 +0000)]
Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev

8 years agoRun callbacks from fingerprintd through handler.
Jim Miller [Sat, 29 Aug 2015 00:29:49 +0000 (17:29 -0700)]
Run callbacks from fingerprintd through handler.

This fixes a potential race condition on the client monitors
where an async event from fingerprintd could change the state
and disrupt communication with the clients.

Fixes bug 23633702

Change-Id: I69635ab768f1e8abefd0b0d8b8e73bb81e7b5695

8 years agoam 2e80aa73: am 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity...
Ian Pedowitz [Sat, 29 Aug 2015 00:57:55 +0000 (00:57 +0000)]
am 2e80aa73: am 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev

* commit '2e80aa7302611b698897129c379907b18da89b91':
  Show the ResolverActivity in dock mode

8 years agoam 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode...
Ian Pedowitz [Sat, 29 Aug 2015 00:52:10 +0000 (00:52 +0000)]
am 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev

* commit '6f75cb1476c1e59a255078468aa586b6fca32ee8':
  Show the ResolverActivity in dock mode

8 years agoam 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev
Ian Pedowitz [Sat, 29 Aug 2015 00:40:19 +0000 (00:40 +0000)]
am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev

* commit '8d027e6d523d13a9cf2a5cf4ef901cc3e78b901d':
  Show the ResolverActivity in dock mode

8 years agoSupport uneditable enhanced 4g lte mode config
Sungmin Choi [Wed, 26 Aug 2015 06:30:34 +0000 (23:30 -0700)]
Support uneditable enhanced 4g lte mode config

Bug: 23539759
Change-Id: I069d994eaef2f57c3d01ff2f36abcd274da431a5

8 years agoam 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev
Ian Pedowitz [Sat, 29 Aug 2015 00:31:29 +0000 (00:31 +0000)]
am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev

* commit '3c227bf2418c6d1b6831f0fa7ad0442b0fcbdc07':
  Show the ResolverActivity in dock mode

8 years agoam 1517c365: am 38ba43a4: am 60337b6b: am e774bdd6: Merge "Added animation for truste...
Selim Cinek [Sat, 29 Aug 2015 00:22:26 +0000 (00:22 +0000)]
am 1517c365: am 38ba43a4: am 60337b6b: am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev

* commit '1517c365aaf0d0248072f8292d5318dd4b7a80fe':
  Added animation for trusted to fingerprint error

8 years agoMerge "Show the ResolverActivity in dock mode" into mnc-dev
Ian Pedowitz [Sat, 29 Aug 2015 00:20:27 +0000 (00:20 +0000)]
Merge "Show the ResolverActivity in dock mode" into mnc-dev

8 years agoam b8ae1879: Merge "Fix android:theme parsing for custom views." into mnc-ub-dev
Deepanshu Gupta [Sat, 29 Aug 2015 00:02:26 +0000 (00:02 +0000)]
am b8ae1879: Merge "Fix android:theme parsing for custom views." into mnc-ub-dev

* commit 'b8ae187932ff783711ea8715d7f5891d9e4ebb32':
  Fix android:theme parsing for custom views.

8 years agoMerge "Fix android:theme parsing for custom views." into mnc-ub-dev
Deepanshu Gupta [Fri, 28 Aug 2015 23:50:00 +0000 (23:50 +0000)]
Merge "Fix android:theme parsing for custom views." into mnc-ub-dev

8 years agoam 4f8653c3: (-s ours) am 3fc6f441: (-s ours) Merge "Do not merge namespaces"
Christopher Wiley [Fri, 28 Aug 2015 23:45:55 +0000 (23:45 +0000)]
am 4f8653c3: (-s ours) am 3fc6f441: (-s ours) Merge "Do not merge namespaces"

* commit '4f8653c3715631d7b8d3b1e3ea600b6b1755addc':
  Do not merge namespaces

8 years agoMerge "Small cleanups around indexOfChild usage."
Vadim Tryshev [Fri, 28 Aug 2015 23:45:15 +0000 (23:45 +0000)]
Merge "Small cleanups around indexOfChild usage."

8 years agoSmall cleanups around indexOfChild usage.
Vadim Tryshev [Fri, 28 Aug 2015 23:43:49 +0000 (16:43 -0700)]
Small cleanups around indexOfChild usage.

Bug: 20024603
Change-Id: I56e478c1b65b5a112a486141406f29f8acd7bb9d

8 years agoam 38ba43a4: am 60337b6b: am e774bdd6: Merge "Added animation for trusted to fingerpr...
Selim Cinek [Fri, 28 Aug 2015 23:36:04 +0000 (23:36 +0000)]
am 38ba43a4: am 60337b6b: am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev

* commit '38ba43a45e5c9c9e82d07bd35c06a32cde9b234d':
  Added animation for trusted to fingerprint error

8 years agoam 60337b6b: am e774bdd6: Merge "Added animation for trusted to fingerprint error...
Selim Cinek [Fri, 28 Aug 2015 23:28:30 +0000 (23:28 +0000)]
am 60337b6b: am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev

* commit '60337b6bd73bcf208c89c1d5ac6ff50d51c0700f':
  Added animation for trusted to fingerprint error

8 years agoam 27912dfd: am e6b0282a: am a2681383: am acace94c: Fix race condition by guarding...
Jorim Jaggi [Fri, 28 Aug 2015 23:25:51 +0000 (23:25 +0000)]
am 27912dfd: am e6b0282a: am a2681383: am acace94c: Fix race condition by guarding callbacks

* commit '27912dfd866f2631803a35c1ec47b6f31f8d2054':
  Fix race condition by guarding callbacks

8 years agoam 3fc6f441: (-s ours) Merge "Do not merge namespaces"
Christopher Wiley [Fri, 28 Aug 2015 23:19:02 +0000 (23:19 +0000)]
am 3fc6f441: (-s ours) Merge "Do not merge namespaces"

* commit '3fc6f441ac88aff88a9c474bd1ae93dfde3ed11a':
  Do not merge namespaces

8 years agoam e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev
Selim Cinek [Fri, 28 Aug 2015 23:17:50 +0000 (23:17 +0000)]
am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev

* commit 'e774bdd6f09a65886429a2d84a6af7e4b6352280':
  Added animation for trusted to fingerprint error

8 years agoam e6b0282a: am a2681383: am acace94c: Fix race condition by guarding callbacks
Jorim Jaggi [Fri, 28 Aug 2015 23:13:30 +0000 (23:13 +0000)]
am e6b0282a: am a2681383: am acace94c: Fix race condition by guarding callbacks

* commit 'e6b0282a8440f77adc310ddcbef5e191d31ef6af':
  Fix race condition by guarding callbacks

8 years agoMerge "Do not merge namespaces"
Christopher Wiley [Fri, 28 Aug 2015 23:09:50 +0000 (23:09 +0000)]
Merge "Do not merge namespaces"

8 years agoMerge "Added animation for trusted to fingerprint error" into mnc-dr-dev
Selim Cinek [Fri, 28 Aug 2015 23:09:19 +0000 (23:09 +0000)]
Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev

8 years agoam a2681383: am acace94c: Fix race condition by guarding callbacks
Jorim Jaggi [Fri, 28 Aug 2015 23:02:04 +0000 (23:02 +0000)]
am a2681383: am acace94c: Fix race condition by guarding callbacks

* commit 'a26813838015072999bf7f8c83b0be2dd5e1430b':
  Fix race condition by guarding callbacks

8 years agoam acace94c: Fix race condition by guarding callbacks
Jorim Jaggi [Fri, 28 Aug 2015 22:49:16 +0000 (22:49 +0000)]
am acace94c: Fix race condition by guarding callbacks

* commit 'acace94c1739b08ea72dc6c2f49cf29bce6c1dac':
  Fix race condition by guarding callbacks

8 years agoTweak systrace calls
Todd Kennedy [Fri, 28 Aug 2015 22:14:35 +0000 (15:14 -0700)]
Tweak systrace calls

Tracing needed a few tweaks.

First, add overall tracing for all of the incoming methods that cause a
package to go through the install flow -- installPackageAsUser, installStage
and movePackage.

Second, add a few more traces for things such as dexopt.

Third, adjust some of the calls; avoid using the async trace methods
when they're not necessary, etc...

Change-Id: Iff47189ddad4478d9fbc6eac2f7031e54cba6271

8 years agoam 7ba74bf2: am e65066d3: am 7a193899: am 96990d0c: Merge "Fix DngCreator default...
Ruben Brunk [Fri, 28 Aug 2015 22:16:11 +0000 (22:16 +0000)]
am 7ba74bf2: am e65066d3: am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev

* commit '7ba74bf2600d3227521c4a1a61197df4a48cc805':
  Fix DngCreator default crop calculations.

8 years agoam 8096be27: am fbb28f55: am 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNEC...
Robert Greenwalt [Fri, 28 Aug 2015 22:16:02 +0000 (22:16 +0000)]
am 8096be27: am fbb28f55: am 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev

* commit '8096be27323b26ae177255381366823c8448e3c5':
  Reduce CONNECTIVITY_CHANGE bcasts

8 years agoFix race condition by guarding callbacks
Jorim Jaggi [Fri, 28 Aug 2015 18:46:10 +0000 (11:46 -0700)]
Fix race condition by guarding callbacks

Bug: 23587553
Change-Id: Ia71760013f3acbb5aeb4e30bb716683c9c672742

8 years agoam e65066d3: am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculation...
Ruben Brunk [Fri, 28 Aug 2015 22:05:46 +0000 (22:05 +0000)]
am e65066d3: am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev

* commit 'e65066d30eb52d2ef938501890ba4cf99d8f1b7b':
  Fix DngCreator default crop calculations.

8 years agoam fbb28f55: am 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE...
Robert Greenwalt [Fri, 28 Aug 2015 22:05:38 +0000 (22:05 +0000)]
am fbb28f55: am 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev

* commit 'fbb28f5552fe42453ebaf48fc11a7c07a5c9bd8b':
  Reduce CONNECTIVITY_CHANGE bcasts

8 years agoam 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into...
Ruben Brunk [Fri, 28 Aug 2015 21:55:40 +0000 (21:55 +0000)]
am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev

* commit '7a193899c9b5f7911b6fdb7db27f91c441a63ed3':
  Fix DngCreator default crop calculations.

8 years agoam 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts"...
Robert Greenwalt [Fri, 28 Aug 2015 21:55:33 +0000 (21:55 +0000)]
am 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev

* commit '77d02900d8ab287f8dcecabda44766e15dbfad4f':
  Reduce CONNECTIVITY_CHANGE bcasts

8 years agoFix android:theme parsing for custom views.
Deepanshu Gupta [Fri, 28 Aug 2015 18:53:46 +0000 (11:53 -0700)]
Fix android:theme parsing for custom views.

Change-Id: Iba83ba1d2e4a96461cc298a759e32e4e51e311a0

8 years agoam 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev
Ruben Brunk [Fri, 28 Aug 2015 21:47:24 +0000 (21:47 +0000)]
am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev

* commit '96990d0cdd7f7757ba16b927766854e0dc6fa994':
  Fix DngCreator default crop calculations.

8 years agoam 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
Robert Greenwalt [Fri, 28 Aug 2015 21:47:20 +0000 (21:47 +0000)]
am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev

* commit '5799f428063cec8f0b85cdff41185e0725b19b74':
  Reduce CONNECTIVITY_CHANGE bcasts

8 years agoMerge "Non-system users can now have restricted profiles"
Fyodor Kupolov [Fri, 28 Aug 2015 21:44:54 +0000 (21:44 +0000)]
Merge "Non-system users can now have restricted profiles"