OSDN Git Service

android-x86/frameworks-base.git
9 years agoAAPT: Gate v21 resource synthesizing logging behind -v flag
Adam Lesinski [Fri, 3 Oct 2014 21:57:28 +0000 (14:57 -0700)]
AAPT: Gate v21 resource synthesizing logging behind -v flag

This is verbose information and should be hidden behind the -v flag.

Bug:17822471
Change-Id: I36e2c6beb54669a31cde73416427477a80ded8a6

9 years agoMerge "Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything" into...
Dianne Hackborn [Fri, 3 Oct 2014 00:40:25 +0000 (00:40 +0000)]
Merge "Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything" into lmp-dev

9 years agoMaybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything
Dianne Hackborn [Fri, 3 Oct 2014 00:21:27 +0000 (17:21 -0700)]
Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything

Tweak the oom tuning to raise everything by 50%.  This is the same
increase we did for Volantis; I am thinking that most of the issue
there was not it being 64 bit, but it being tighter on RAM.  From
my testing, it looks like in user switching there was some paging
going on with Nakasi, and with this change things seem to be better.

We should probably revisit this for future work on RAM.  It seems
likely that a 64 bit device will need more RAM, so probably the value
I am picking here is larger than we actually need for other devices.
I think this is the safest change at this point though -- it leaves
Volantis the same, where we already had tweaked it to address paging
issues, raises it on Nakasi (to the same value as Volantis) where we
seem to have paging issues, and on our other devices also raises it
but those are generally not under memory pressure so this shouldn't
really make a difference.

Change-Id: Ib19394068734d322a015ed07370d9d4961877e4b

9 years agoMerge "Fix theme propagation to contained android:drawable elements" into lmp-dev
Alan Viverette [Thu, 2 Oct 2014 23:10:04 +0000 (23:10 +0000)]
Merge "Fix theme propagation to contained android:drawable elements" into lmp-dev

9 years agoMerge "Add @SystemApi to missing TelecomManager methods" into lmp-dev
Evan Charlton [Thu, 2 Oct 2014 23:05:22 +0000 (23:05 +0000)]
Merge "Add @SystemApi to missing TelecomManager methods" into lmp-dev

9 years agoam 721b3efc: am 46d8d0cd: am c470faab: docs:ADT 23.0.4 doc updates
Rich Slogar [Thu, 2 Oct 2014 22:57:45 +0000 (22:57 +0000)]
am 721b3efc: am 46d8d0cd: am c470faab: docs:ADT 23.0.4 doc updates

* commit '721b3efc205442e255170d0185ae374b5a5ddc50':
  docs:ADT 23.0.4 doc updates

9 years agoFix theme propagation to contained android:drawable elements
Alan Viverette [Thu, 2 Oct 2014 22:53:31 +0000 (15:53 -0700)]
Fix theme propagation to contained android:drawable elements

BUG: 17790666
Change-Id: I6733a98e779cad0d384b917c57d2b3409a166c02

9 years agoam 46d8d0cd: am c470faab: docs:ADT 23.0.4 doc updates
Rich Slogar [Thu, 2 Oct 2014 22:52:49 +0000 (22:52 +0000)]
am 46d8d0cd: am c470faab: docs:ADT 23.0.4 doc updates

* commit '46d8d0cdb349ca0a3f6ef199e1cc1dcba4c2d6eb':
  docs:ADT 23.0.4 doc updates

9 years agoMerge "SDK only: Update docs to reflect current implementation." into lmp-dev
Dianne Hackborn [Thu, 2 Oct 2014 22:49:41 +0000 (22:49 +0000)]
Merge "SDK only: Update docs to reflect current implementation." into lmp-dev

9 years agoam c470faab: docs:ADT 23.0.4 doc updates
Rich Slogar [Thu, 2 Oct 2014 22:47:15 +0000 (22:47 +0000)]
am c470faab: docs:ADT 23.0.4 doc updates

* commit 'c470faab3ee47b5643ee6b0a97c925c8f0f587fa':
  docs:ADT 23.0.4 doc updates

9 years agoMerge "Synchronize on all sendProxyBroadcast calls" into lmp-dev
Jason Monk [Thu, 2 Oct 2014 22:36:45 +0000 (22:36 +0000)]
Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev

9 years agodocs:ADT 23.0.4 doc updates
Rich Slogar [Thu, 2 Oct 2014 22:13:09 +0000 (15:13 -0700)]
docs:ADT 23.0.4 doc updates

Change-Id: Ibf412802e7c98ed3beff6c61394f1b3962254d9a

9 years agoMerge "Fix race in RecognizerService teardown." into lmp-dev
Jeff Brown [Thu, 2 Oct 2014 22:04:08 +0000 (22:04 +0000)]
Merge "Fix race in RecognizerService teardown." into lmp-dev

9 years agoam 285859b1: am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23...
Joe Fernandez [Thu, 2 Oct 2014 21:50:09 +0000 (21:50 +0000)]
am 285859b1: am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs

* commit '285859b13728c5cfb6124c11212978f8f95cd9de':
  Revert "docs: Update for Android 23.0.4"

9 years agoMerge "Fix a bug with screen brightness during screen off animation." into lmp-dev
Baligh Uddin [Thu, 2 Oct 2014 21:38:24 +0000 (21:38 +0000)]
Merge "Fix a bug with screen brightness during screen off animation." into lmp-dev

9 years agoMerge "Tweak wallpaper restore acceptance heuristics" into lmp-dev
Christopher Tate [Thu, 2 Oct 2014 21:32:47 +0000 (21:32 +0000)]
Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev

9 years agoam d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp...
Joe Fernandez [Thu, 2 Oct 2014 21:32:15 +0000 (21:32 +0000)]
am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs

* commit 'd36dbe09a18fc7226029e841cb2a856fb83c81f2':
  Revert "docs: Update for Android 23.0.4"

9 years agoTweak wallpaper restore acceptance heuristics
Christopher Tate [Thu, 2 Oct 2014 20:39:12 +0000 (13:39 -0700)]
Tweak wallpaper restore acceptance heuristics

We now accept for restore any image that is at least wide enough to
fit the screen, and has a height within a comfortable margin of the
previously stated target.

Bug 17677006

Change-Id: I5937a82ddfbfa0bbb30d568621eb48e4b3533fac

9 years agoMerge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into...
Etan Cohen [Thu, 2 Oct 2014 21:16:28 +0000 (21:16 +0000)]
Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev

9 years agoam e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
Joe Fernandez [Thu, 2 Oct 2014 21:14:59 +0000 (21:14 +0000)]
am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs

* commit 'e961d0b521bc25caf964258e75fef3d3ea22e4ac':
  Revert "docs: Update for Android 23.0.4"

9 years agoMerge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
Joe Fernandez [Thu, 2 Oct 2014 21:08:27 +0000 (21:08 +0000)]
Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs

9 years agoRevert "docs: Update for Android 23.0.4"
Joe Fernandez [Thu, 2 Oct 2014 21:07:49 +0000 (21:07 +0000)]
Revert "docs: Update for Android 23.0.4"

This reverts commit f34d0e69033165b7a6e9c73b99f4ef6ac36b3896.

Change-Id: I4d521392733f1b028c72d4623d6d69a4c5910bc4

9 years agoAdd @SystemApi to missing TelecomManager methods
Evan Charlton [Thu, 2 Oct 2014 20:45:27 +0000 (13:45 -0700)]
Add @SystemApi to missing TelecomManager methods

A few methods (which should be exposed) were missing @SystemApi
annotations.

TelecomManager#addNewIncomingCall
TelecomManager#registerPhoneAccount
TelecomManager#unregisterPhoneAccount

Bug: 17786491
Change-Id: Idf318cf6238668762c00ed0913a9c0ccd5bcb884

9 years agoRevert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"
Matthew Williams [Thu, 2 Oct 2014 04:12:28 +0000 (04:12 +0000)]
Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"

This reverts commit cf2bd348e73e880fe5bfc7a025732d4ec606ff1f.

Reverted because for account removal the AccountManagerService
delegates the sending of LOGIN_ACCOUNTS_CHANGED to the authenticator.
See b/17511110.

Change-Id: Ic03016af98070b4add5f7a5ec1fdff32ba63298e

9 years agoAllow system app to take ownership of built-in permissions
Jing Ji [Wed, 1 Oct 2014 18:31:19 +0000 (13:31 -0500)]
Allow system app to take ownership of built-in permissions

Previous commit bfed9f34c makes the preloaded system app take
precedence over third-party apps when defining permissions, but
it also makes it be able to override android built-in permissions.

Now allow preloaded system app to take the ownership of built-in
permissions instead of overriding it.

Change-Id: I10d588d0284e4316ea4be552fd6191f33e3c725b

9 years agoMerge "Remove misleading error log." into lmp-dev
Craig Mautner [Thu, 2 Oct 2014 20:13:54 +0000 (20:13 +0000)]
Merge "Remove misleading error log." into lmp-dev

9 years agoFix a bug with screen brightness during screen off animation.
Jeff Brown [Thu, 2 Oct 2014 20:08:05 +0000 (13:08 -0700)]
Fix a bug with screen brightness during screen off animation.

Due to a recent change there was a regression that caused the
screen brightness to be animated down to 0 while the screen
off animation was running.  When the brightness was low this
would cause the screen off animation to be cut short.

This change ensures that we take into account the actual screen
state instead of the desired screen state when making screen
brightness decisions in case we are in the middle of a transition.

The darkness came early.  The pixel fairies trembled.

Bug: 17718416
Change-Id: Ib4b55d61b359abbc70920e324f08a5db07bdd035

9 years agoSDK only: Update docs to reflect current implementation.
Dianne Hackborn [Thu, 2 Oct 2014 19:42:18 +0000 (12:42 -0700)]
SDK only: Update docs to reflect current implementation.

Change-Id: I498425bb55b157c954af6a2441d8bd9be3871c55

9 years agoSynchronize on all sendProxyBroadcast calls
Jason Monk [Thu, 2 Oct 2014 19:39:38 +0000 (15:39 -0400)]
Synchronize on all sendProxyBroadcast calls

To avoid race conditions.  Also make mDefaultProxy volatile for
safety.

Bug: 17697364
Change-Id: I8f0abb1a6e1c816f3addc11a69ff794ad767f2cf

9 years agoRemove misleading error log.
Craig Mautner [Thu, 2 Oct 2014 19:24:02 +0000 (12:24 -0700)]
Remove misleading error log.

It's perfectly ok for a secondary display to not have a home stack.
There is no reason to report it.

Related to b/17677973.

Change-Id: Ia9d52cabb601760d32d2b847dfa0ca4f304e4e2a

9 years agoAdd TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
Etan Cohen [Thu, 2 Oct 2014 18:06:23 +0000 (11:06 -0700)]
Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.

Bug: 17784975
Change-Id: Ic887477fac1d45f547e30ed6e3c1158fb9a3b893

9 years agoFix race in RecognizerService teardown.
Jeff Brown [Thu, 2 Oct 2014 19:06:50 +0000 (12:06 -0700)]
Fix race in RecognizerService teardown.

Use a WeakReference to refer to the outer class to prevent leaks.
Ensure atomicity of access to the reference.

Bug: 17584947
Change-Id: I7ad7c7793b60fa125e04fc4d803ed905e8a00a95

9 years agoam e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu...
Ricardo Cervera [Thu, 2 Oct 2014 18:18:30 +0000 (18:18 +0000)]
am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs

* commit 'e1e0e05a14ebb87ca1921cf21a98b9fa0067b14e':
  docs: Provide direct link to Ubuntu troubleshooting.

9 years agoam 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting...
Ricardo Cervera [Thu, 2 Oct 2014 18:13:55 +0000 (18:13 +0000)]
am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs

* commit '957f45c328c9cbe9d1fb65dab6d342dc28a85954':
  docs: Provide direct link to Ubuntu troubleshooting.

9 years agoam 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp...
Ricardo Cervera [Thu, 2 Oct 2014 18:07:53 +0000 (18:07 +0000)]
am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs

* commit '680092c5987e701043ff0fa0d2c5390e829412c0':
  docs: Provide direct link to Ubuntu troubleshooting.

9 years agoMerge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs
Ricardo Cervera [Thu, 2 Oct 2014 18:04:41 +0000 (18:04 +0000)]
Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs

9 years agodocs: Provide direct link to Ubuntu troubleshooting.
Ricardo Cervera [Thu, 2 Oct 2014 01:32:42 +0000 (18:32 -0700)]
docs: Provide direct link to Ubuntu troubleshooting.

Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be

9 years agoam 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into...
Rich Slogar [Thu, 2 Oct 2014 17:53:38 +0000 (17:53 +0000)]
am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs

* commit '74ce7413158607af6be2889d7392c2e904c9c210':
  docs: Update for Android 23.0.4

9 years agoam b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular...
Rich Slogar [Thu, 2 Oct 2014 17:44:43 +0000 (17:44 +0000)]
am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs

* commit 'b15cd5296675fac00e5517b89fc1263d59fbad65':
  docs: Update for Android 23.0.4

9 years agoam c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs
Rich Slogar [Thu, 2 Oct 2014 17:38:35 +0000 (17:38 +0000)]
am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs

* commit 'c074c3a4074791ae1270e3177e2299f31b9bb5a1':
  docs: Update for Android 23.0.4

9 years agoMerge "docs: Update for Android 23.0.4" into klp-modular-docs
Rich Slogar [Thu, 2 Oct 2014 17:31:04 +0000 (17:31 +0000)]
Merge "docs: Update for Android 23.0.4" into klp-modular-docs

9 years agodocs: Update for Android 23.0.4
Rich Slogar [Wed, 1 Oct 2014 18:37:18 +0000 (11:37 -0700)]
docs: Update for Android 23.0.4

Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf

9 years agoMerge "SettingsProvider should use correct cache when redirecting to user 0." into...
Kenny Guy [Thu, 2 Oct 2014 16:48:56 +0000 (16:48 +0000)]
Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev

9 years agoMerge "Fix some documentation typos." into lmp-dev
Newton Allen [Thu, 2 Oct 2014 16:39:11 +0000 (16:39 +0000)]
Merge "Fix some documentation typos." into lmp-dev

9 years agoMerge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into...
smain@google.com [Thu, 2 Oct 2014 15:02:16 +0000 (15:02 +0000)]
Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev

9 years agoMerge "Fix ChangeTransform works only once on a View." into lmp-dev
George Mount [Thu, 2 Oct 2014 14:27:18 +0000 (14:27 +0000)]
Merge "Fix ChangeTransform works only once on a View." into lmp-dev

9 years agoMerge "Revert the configKey generation algorithm to what it was in K." into lmp-dev
Lorenzo Colitti [Thu, 2 Oct 2014 11:05:19 +0000 (11:05 +0000)]
Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev

9 years agoam ae74287e: (-s ours) am fca5e557: Merge "Mark constructor as accessible in LayoutIn...
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:09 +0000 (08:51 +0000)]
am ae74287e: (-s ours) am fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev

* commit 'ae74287e036b432ca394cbc497386547b16c17ff':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]

9 years agoam ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE...
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:06 +0000 (08:51 +0000)]
am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev

* commit 'ae4cb17a14d2a66961728d3cbd907cdba3f2f6d6':
  Resource resolution bug fix. [DO NOT MERGE]

9 years agoam d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT...
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:02 +0000 (08:51 +0000)]
am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev

* commit 'd00d2ff2079ca4e77173e3389834416494c7900f':
  Fix Tests after cherry picks. [DO NOT MERGE]

9 years agoam 735229c5: (-s ours) am 52af468b: Merge "Update intelliJ copyright profile [DO...
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:58 +0000 (08:50 +0000)]
am 735229c5: (-s ours) am 52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev

* commit '735229c5a8286f1ecff5cf54d9ce2c06d7f97d51':
  Update intelliJ copyright profile [DO NOT MERGE]

9 years agoam 925abb6d: (-s ours) am 891f38d1: Merge "Build layoutlib create tests as part of...
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:54 +0000 (08:50 +0000)]
am 925abb6d: (-s ours) am 891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev

* commit '925abb6d983aef0016b5828349d53cc5a11ebad8':
  Build layoutlib create tests as part of sdk build. [DO NOT MERGE]

9 years agoam a21ca344: (-s ours) am a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT...
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:51 +0000 (08:50 +0000)]
am a21ca344: (-s ours) am a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev

* commit 'a21ca3449457c5a80b5f06ca9a1fe7b17eb33bff':
  Add layoutlib tests to DIST_DIR [DO NOT MERGE]

9 years agoam 93bf0696: (-s ours) am 541e6e5d: Merge "Build layoutlib_create tests. [DO NOT...
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:47 +0000 (08:50 +0000)]
am 93bf0696: (-s ours) am 541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev

* commit '93bf0696e74282fea614120f7e26951111150e48':
  Build layoutlib_create tests. [DO NOT MERGE]

9 years agoam ddbd9bec: (-s ours) am 2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ...
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:43 +0000 (08:50 +0000)]
am ddbd9bec: (-s ours) am 2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev

* commit 'ddbd9bec76036fb2ce9f1cd1b7ccb70bd859a1a5':
  Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]

9 years agoam 1cbf17f7: (-s ours) am ffa4115a: Merge "Get filename from File faster [DO NOT...
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:38 +0000 (08:50 +0000)]
am 1cbf17f7: (-s ours) am ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev

* commit '1cbf17f7654d5ddb66ce76e0f50fe7f170726e20':
  Get filename from File faster [DO NOT MERGE]

9 years agoam d332ff3e: (-s ours) am bae64421: Merge "Add testing framework to LayoutLib. [DO...
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:34 +0000 (08:50 +0000)]
am d332ff3e: (-s ours) am bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev

* commit 'd332ff3e3f647b9514ecff1f146464fbc1a93372':
  Add testing framework to LayoutLib. [DO NOT MERGE]

9 years agoam c2ffb54f: (-s ours) am 60f3676e: Merge "Add tests to the layoutlib eclipse project...
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:31 +0000 (08:50 +0000)]
am c2ffb54f: (-s ours) am 60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev

* commit 'c2ffb54fe29d5fcbdd866fd304a9e97af825221a':
  Add tests to the layoutlib eclipse project. [DO NOT MERGE]

9 years agoam bf6f081c: (-s ours) am 37185d90: Merge "DO NOT MERGE Hide the volume panel for...
Justin Koh [Thu, 2 Oct 2014 08:50:27 +0000 (08:50 +0000)]
am bf6f081c: (-s ours) am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev

* commit 'bf6f081cda7360810645cf6bf932687df1cfae00':
  DO NOT MERGE Hide the volume panel for watches for now

9 years agoMerge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev
Andreas Gampe [Thu, 2 Oct 2014 08:45:45 +0000 (08:45 +0000)]
Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev

9 years agoRevert "Frameworks/base: Update to preloaded-classes"
Andreas Gampe [Thu, 2 Oct 2014 08:42:00 +0000 (08:42 +0000)]
Revert "Frameworks/base: Update to preloaded-classes"

Breaks shamu for unknown reason.

This reverts commit da3050614fc9dc31d39ff87ae5df0261fb76f93c.

Bug: 17480683
Change-Id: Id10ff18ef6e3acb5eb84196f7e5608add7edeb66

9 years agoMerge "Send app permissions to netd." into lmp-dev
Sreeram Ramachandran [Thu, 2 Oct 2014 06:26:26 +0000 (06:26 +0000)]
Merge "Send app permissions to netd." into lmp-dev

9 years agoam fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE...
Deepanshu Gupta [Thu, 2 Oct 2014 03:38:44 +0000 (03:38 +0000)]
am fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev

* commit 'fca5e5577f3690b03e783e4208379011aec46d28':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]

9 years agoam 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:24 +0000 (03:34 +0000)]
am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev

* commit '76aff1f6ab84b8ac9f4a48ae7dff62ece00e1b97':
  Resource resolution bug fix. [DO NOT MERGE]

9 years agoam 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:19 +0000 (03:34 +0000)]
am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev

* commit '579338345721351313d4c3cd2a5114a0d135028d':
  Fix Tests after cherry picks. [DO NOT MERGE]

9 years agoam 52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modula...
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:14 +0000 (03:34 +0000)]
am 52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev

* commit '52af468b5e0b6daa1906694b37584366d616159f':
  Update intelliJ copyright profile [DO NOT MERGE]

9 years agoam 891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE...
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:10 +0000 (03:34 +0000)]
am 891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev

* commit '891f38d181505406298bb3b922a33e24de6aaf02':
  Build layoutlib create tests as part of sdk build. [DO NOT MERGE]

9 years agoam a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:06 +0000 (03:34 +0000)]
am a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev

* commit 'a2f088b6775f0cd0a8b7e3b35e16f13de3f67b01':
  Add layoutlib tests to DIST_DIR [DO NOT MERGE]

9 years agoam 541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:01 +0000 (03:34 +0000)]
am 541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev

* commit '541e6e5d47b928f3cd73f9e8f1da83ff722892c8':
  Build layoutlib_create tests. [DO NOT MERGE]

9 years agoam 2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT...
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:57 +0000 (03:33 +0000)]
am 2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev

* commit '2d77fad26b0fa2203366d08aeccec9b564a70647':
  Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]

9 years agoam ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:53 +0000 (03:33 +0000)]
am ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev

* commit 'ffa4115a0ed065d816171c68609cd738672f5e51':
  Get filename from File faster [DO NOT MERGE]

9 years agoam bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp...
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:48 +0000 (03:33 +0000)]
am bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev

* commit 'bae6442159838206d826775bcebf92fa86f64a93':
  Add testing framework to LayoutLib. [DO NOT MERGE]

9 years agoam 60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into...
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:42 +0000 (03:33 +0000)]
am 60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev

* commit '60f3676e087db7baa8e67b9cbd18cffc90c4ac09':
  Add tests to the layoutlib eclipse project. [DO NOT MERGE]

9 years agoMerge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp...
Deepanshu Gupta [Thu, 2 Oct 2014 03:32:27 +0000 (03:32 +0000)]
Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev

9 years agoMerge "Always resolve enum when resolving resources." into lmp-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:27:41 +0000 (03:27 +0000)]
Merge "Always resolve enum when resolving resources." into lmp-dev

9 years agoMerge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:48 +0000 (03:26 +0000)]
Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev

9 years agoMerge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:43 +0000 (03:26 +0000)]
Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev

9 years agoMerge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:37 +0000 (03:26 +0000)]
Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev

9 years agoMerge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp...
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:31 +0000 (03:26 +0000)]
Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev

9 years agoMerge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:21 +0000 (03:26 +0000)]
Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev

9 years agoMerge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:04 +0000 (03:26 +0000)]
Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev

9 years agoMerge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into...
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:02 +0000 (03:26 +0000)]
Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev

9 years agoMerge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:42 +0000 (03:25 +0000)]
Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev

9 years agoMerge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:36 +0000 (03:25 +0000)]
Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev

9 years agoMerge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:31 +0000 (03:25 +0000)]
Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev

9 years agoSend app permissions to netd.
Sreeram Ramachandran [Wed, 24 Sep 2014 16:16:19 +0000 (09:16 -0700)]
Send app permissions to netd.

Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02

9 years agofix confusing sentence
smain@google.com [Thu, 2 Oct 2014 01:25:13 +0000 (18:25 -0700)]
fix confusing sentence
https://memegen.googleplex.com/5524829602054144

Change-Id: I451c167bd1aedbde4b0e676f5f74a9dacb20fc10

9 years agoMerge "More work on issue #17656716: Unhandled exception in Window Manager" into...
Dianne Hackborn [Thu, 2 Oct 2014 00:23:17 +0000 (00:23 +0000)]
Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

9 years agoMerge "Implement auto-sleep functionality." into lmp-dev
Erik Pasternak [Thu, 2 Oct 2014 00:00:39 +0000 (00:00 +0000)]
Merge "Implement auto-sleep functionality." into lmp-dev

9 years agoMore work on issue #17656716: Unhandled exception in Window Manager
Dianne Hackborn [Wed, 1 Oct 2014 21:59:58 +0000 (14:59 -0700)]
More work on issue #17656716: Unhandled exception in Window Manager

Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock.  This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it.  And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing.  So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041

9 years agoMerge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev
Jeff Sharkey [Wed, 1 Oct 2014 23:43:55 +0000 (23:43 +0000)]
Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev

9 years agoMerge "Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825...
Dianne Hackborn [Wed, 1 Oct 2014 23:29:48 +0000 (23:29 +0000)]
Merge "Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev

9 years agoMerge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev
ztenghui [Wed, 1 Oct 2014 23:29:31 +0000 (23:29 +0000)]
Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev

9 years agoGive audio GID to MANAGE_VOICE_KEYPHRASES apps.
Jeff Sharkey [Wed, 1 Oct 2014 23:02:05 +0000 (16:02 -0700)]
Give audio GID to MANAGE_VOICE_KEYPHRASES apps.

Some system apps doing hotword training need low-level access to
audio hardware, beyond what the existing HAL offers.  For now, give
them the audio GID.

Bug: 17763721
Change-Id: I8025c3abacae13a6ffec4e10e4976a67ab505bdf

9 years agoMerge "Fix accessiblity introspection from the shell user regression." into lmp-dev
Svetoslav [Wed, 1 Oct 2014 23:24:46 +0000 (23:24 +0000)]
Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev

9 years agoMerge "Revert white space changes." into lmp-dev
Dianne Hackborn [Wed, 1 Oct 2014 23:21:10 +0000 (23:21 +0000)]
Merge "Revert white space changes." into lmp-dev

9 years ago+ correcting shadow visual appearance (b/17610926)
ztenghui [Wed, 1 Oct 2014 23:10:16 +0000 (16:10 -0700)]
+ correcting shadow visual appearance (b/17610926)

+ adjusting spot and ambient shadow opacity constants to achieve desired appearance
+ reducing ambient scale ratio back to 1.0 to address over-lightening at higher elevations
+ partially revert ag/546290

Change-Id: I9d7f664f73a7b9b83df73b739103c97054bd4f6e

9 years agoMerge "include direct.h for _mkdir" into lmp-dev
Stephen Hines [Wed, 1 Oct 2014 22:53:59 +0000 (22:53 +0000)]
Merge "include direct.h for _mkdir" into lmp-dev

9 years agoMerge "Fixing invalid check to get component enabled state. (Bug 17679693)" into...
Winson Chung [Wed, 1 Oct 2014 22:53:27 +0000 (22:53 +0000)]
Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev

9 years agoFix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build.
Dianne Hackborn [Wed, 1 Oct 2014 22:53:28 +0000 (15:53 -0700)]
Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build.

There was a path through idle where we could clear mBooting but not set
mBooted, so we would no longer start activities.  This is probably happening
because if you start a user or userdebug build with the device plugged in
to adb, the system early on starts the USB security dialog, before home is
started.  If that goes idle first, we will end up in the case where we
clear booting (because something went idle) but not set booted (because it
was not home that went idle).

Change this so that we always set booted when clearing booting.

Change-Id: I40053710eefa939315aeb9475ecdd2e8a87351ff