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

114249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
b5a14f0fc9 resolved conflicts for merge of 1995a7de to master 
Change-Id: I9915ae06d460696b24cbee935738267911baa580
 2013-09-18 14:23:58 -07:00
Dianne Hackborn
1995a7de5b am b9466db4: Merge "Finish issue #10779747: Calendar Storage crash observed..." into klp-dev 
* commit 'b9466db4a56564101a26865962dda87aaeab56ff':
  Finish issue #10779747: Calendar Storage crash observed...
 2013-09-18 13:37:02 -07:00
Dianne Hackborn
b9466db4a5 Merge "Finish issue #10779747: Calendar Storage crash observed..." into klp-dev 2013-09-18 20:34:11 +00:00
Kenny Root
157ae82b6c am faebc647: am bd49a1da: Merge "Change case of "keyset" to "keySet" for manifests" into klp-dev 
* commit 'faebc6470d06e889e65b85adda825dbca52b44ac':
  Change case of "keyset" to "keySet" for manifests
 2013-09-18 13:18:33 -07:00
Kenny Root
faebc6470d am bd49a1da: Merge "Change case of "keyset" to "keySet" for manifests" into klp-dev 
* commit 'bd49a1dadfbd7803642066a5bdc74305a1b2340b':
  Change case of "keyset" to "keySet" for manifests
 2013-09-18 13:16:48 -07:00
Kenny Root
bd49a1dadf Merge "Change case of "keyset" to "keySet" for manifests" into klp-dev 2013-09-18 20:15:26 +00:00
Jonathan Dixon
cfdcdf9f3f am 515134e8: am c7969dea: Merge "Fix obsolete API reference" into klp-dev 
* commit '515134e88c0c1cdfb06a1ec22946554d2d98c8d2':
  Fix obsolete API reference
 2013-09-18 13:13:03 -07:00
Jonathan Dixon
515134e88c am c7969dea: Merge "Fix obsolete API reference" into klp-dev 
* commit 'c7969dea24f2e362f69fb2b912c8a0385f5dc617':
  Fix obsolete API reference
 2013-09-18 13:10:15 -07:00
Jason Monk
ab1fe9d51d am fd4cf800: am 90701f1a: Merge "PAC Local Proxy to only receive lo connections" into klp-dev 
* commit 'fd4cf80003095da1aa0bb17d0febde7d8da31e18':
  PAC Local Proxy to only receive lo connections
 2013-09-18 13:09:33 -07:00
Jason Monk
fd4cf80003 am 90701f1a: Merge "PAC Local Proxy to only receive lo connections" into klp-dev 
* commit '90701f1adada98f1db5a90abbc6af29f4794d70a':
  PAC Local Proxy to only receive lo connections
 2013-09-18 13:06:48 -07:00
Jonathan Dixon
c7969dea24 Merge "Fix obsolete API reference" into klp-dev 2013-09-18 20:06:20 +00:00
Jason Monk
90701f1ada Merge "PAC Local Proxy to only receive lo connections" into klp-dev 2013-09-18 20:04:32 +00:00
Craig Mautner
7c4e91b133 am 566f7fed: am 138685d9: Merge "Move flag for home launching from activity to task." into klp-dev 
* commit '566f7fede191ab2667237e147bee6b74c05ded32':
  Move flag for home launching from activity to task.
 2013-09-18 12:53:10 -07:00
Jonathan Dixon
df3859ebeb Fix obsolete API reference 
Bug 10361803

exportToPdf use-case not supported in K so removing that dangling
reference from the javadoc

Change-Id: Ia0fe3aa9ed5150639d1f72341c89568a0a7e1c7d
 2013-09-18 12:51:47 -07:00
Craig Mautner
566f7fede1 am 138685d9: Merge "Move flag for home launching from activity to task." into klp-dev 
* commit '138685d9db005cbd62ede45eb066a2e672db9588':
  Move flag for home launching from activity to task.
 2013-09-18 12:50:31 -07:00
Raph Levien
c4d7562a93 am 21b0c88b: am c540f8e9: Merge "Revert "Take the input device into account for meta state"" into klp-dev 
* commit '21b0c88b3c290141f9a7593bb249ab117af48b91':
  Revert "Take the input device into account for meta state"
 2013-09-18 12:49:33 -07:00
Raph Levien
21b0c88b3c am c540f8e9: Merge "Revert "Take the input device into account for meta state"" into klp-dev 
* commit 'c540f8e9d704414a06f7a5b4ade1c713042f8c38':
  Revert "Take the input device into account for meta state"
 2013-09-18 12:46:57 -07:00
Craig Mautner
138685d9db Merge "Move flag for home launching from activity to task." into klp-dev 2013-09-18 19:46:53 +00:00
Raph Levien
c540f8e9d7 Merge "Revert "Take the input device into account for meta state"" into klp-dev 2013-09-18 19:44:16 +00:00
Jonathan Dixon
322fe808e3 am b7bdf38b: am 01fc0884: Merge "Update APIs for the Chromium WebView" into klp-dev 
* commit 'b7bdf38bf1d202c844e667f3074bc43f298f11f9':
  Update APIs for the Chromium WebView
 2013-09-18 12:22:20 -07:00
Jonathan Dixon
b7bdf38bf1 am 01fc0884: Merge "Update APIs for the Chromium WebView" into klp-dev 
* commit '01fc088462d05478bcdf416fb02532d53e85dd6a':
  Update APIs for the Chromium WebView
 2013-09-18 12:17:58 -07:00
Jonathan Dixon
01fc088462 Merge "Update APIs for the Chromium WebView" into klp-dev 2013-09-18 19:14:09 +00:00
Dianne Hackborn
6285a32f74 Finish issue #10779747: Calendar Storage crash observed... 
...while setting up a new user from settings.

We can now delay broadcasts when there are enough background services
currently starting (still set to 1 for svelte devices, 3 for normal
devices).

Add new intent flag to not allow receivers to abort broadcasts, which
I use to fix an issue with the initial BOOT_COMPLETED broadcast not
actually requesting pss data at the right time -- it can now be sent
as an ordered broadcast without the ability for the receivers to cancel
it.

Change-Id: I51155bbbabe23e187003f3e2abd7b754e55d3c95
 2013-09-18 12:09:47 -07:00
Craig Mautner
ae7ecab400 Move flag for home launching from activity to task. 
The variable ActivityRecord.mLaunchHomeTaskNext was used to indicate
that the home task should be launched when the activity completed.
This only mattered when it was at the end of a task. As the activity
launched other activities within the same task it needed to be
migrated from activity to activity and task to task. This became
too complicated and was at the wrong level to begin with.

By moving the flag to TaskRecord.mOnTopOfHome the logic is simpler
and the results more predictable.

Fixes bug 10602256.

Change-Id: If0b752522b77be9918f1dba221d0ff670fc01af8
 2013-09-18 11:48:14 -07:00
Kenny Root
add560288a Change case of "keyset" to "keySet" for manifests 
Bug: 10461185
Change-Id: Ibfe8cc6e716ac8b76ed7c05c26c332673479b7d8
 2013-09-18 11:16:49 -07:00
Amith Yamasani
dc7e0464b8 am a8b4da87: am 840b3bd6: Merge "Fix provider leak in PFD" into klp-dev 
* commit 'a8b4da872a1824408b52fb1730699fde780cad04':
  Fix provider leak in PFD
 2013-09-18 11:05:49 -07:00
Raph Levien
3954fd9a05 Revert "Take the input device into account for meta state" 
This reverts commit 8a1597b39632956cdbcb6b76874ccca786047d4c. That
commit broke some of the handling of meta state, which in turn caused
CTS test failures, notably bug 10210151 (CTS:
android.text.method.cts.BaseKeyListenerTest#testBackspace_withSendKeys
is failing on KLP).

So this revert fixes those test failures, but leaves bug 8303489
(Pressing shift on the hardware keyboard messes with unrelated
keypresses, including virtual ones) still present. We'll plan to
address that in a future release.

Change-Id: Iea42c643b6d08f33cbd2ed1747e8de3b5f8116a6
 2013-09-18 11:03:02 -07:00
Amith Yamasani
a8b4da872a am 840b3bd6: Merge "Fix provider leak in PFD" into klp-dev 
* commit '840b3bd61185456ccb574c2be115ea78ec418327':
  Fix provider leak in PFD
 2013-09-18 11:02:59 -07:00
Martijn Coenen
7fed4c26ba am 71e3aa2c: am 807fd044: Merge "Validate AID format and length." into klp-dev 
* commit '71e3aa2c6cfb875be2cb44268bc53a84ea0fd5ab':
  Validate AID format and length.
 2013-09-18 11:02:07 -07:00
Amith Yamasani
840b3bd611 Merge "Fix provider leak in PFD" into klp-dev 2013-09-18 18:01:21 +00:00
Martijn Coenen
71e3aa2c6c am 807fd044: Merge "Validate AID format and length." into klp-dev 
* commit '807fd0443564850bc69f229a282cbba990e1b656':
  Validate AID format and length.
 2013-09-18 10:59:20 -07:00
Chet Haase
7adbecf000 am c8bcf4f2: am d73d34c8: Merge "Use transition-only alpha property for fading transitions" into klp-dev 
* commit 'c8bcf4f21ac81ab8e36470d50c3a238c7627b970':
  Use transition-only alpha property for fading transitions
 2013-09-18 10:58:31 -07:00
Leon Scroggins III
44f65cb5fd am 2e4e9889: am 3490228e: Merge "Use a native buffer for decoding images." into klp-dev 
* commit '2e4e98895b17ef248f5071202a3610ac715eaf0e':
  Use a native buffer for decoding images.
 2013-09-18 10:58:27 -07:00
Martijn Coenen
807fd04435 Merge "Validate AID format and length." into klp-dev 2013-09-18 17:56:03 +00:00
Chet Haase
c8bcf4f21a am d73d34c8: Merge "Use transition-only alpha property for fading transitions" into klp-dev 
* commit 'd73d34c873dbf409af3cf6ecbf27cb2be3953b4f':
  Use transition-only alpha property for fading transitions
 2013-09-18 10:55:46 -07:00
Leon Scroggins III
2e4e98895b am 3490228e: Merge "Use a native buffer for decoding images." into klp-dev 
* commit '3490228efb949ad1979c89bb206a3697f5ffc185':
  Use a native buffer for decoding images.
 2013-09-18 10:55:43 -07:00
Zhijun He
44ed752191 am 30ba38ac: am bf143ff1: Merge "ImageReader: disable NV21 support" into klp-dev 
* commit '30ba38ac783dfaa5b784fef9450a173abc6710f3':
  ImageReader: disable NV21 support
 2013-09-18 10:54:54 -07:00
Chet Haase
7e9c8e22d0 am 07861ea8: am 4fa809fe: Merge "Fix leak fix in ViewTreeObserver" into klp-dev 
* commit '07861ea82b5e86e3e4a141f2f1f1468a3f8cc709':
  Fix leak fix in ViewTreeObserver
 2013-09-18 10:54:51 -07:00
Zhijun He
30ba38ac78 am bf143ff1: Merge "ImageReader: disable NV21 support" into klp-dev 
* commit 'bf143ff1955f9ec70fd9435240e3505c5df4804d':
  ImageReader: disable NV21 support
 2013-09-18 10:52:14 -07:00
Chet Haase
07861ea82b am 4fa809fe: Merge "Fix leak fix in ViewTreeObserver" into klp-dev 
* commit '4fa809fe74635720528ab46cff7d2ba0d0aebd8a':
  Fix leak fix in ViewTreeObserver
 2013-09-18 10:52:11 -07:00
Chet Haase
d73d34c873 Merge "Use transition-only alpha property for fading transitions" into klp-dev 2013-09-18 17:51:34 +00:00
Leon Scroggins III
3490228efb Merge "Use a native buffer for decoding images." into klp-dev 2013-09-18 17:50:56 +00:00
Zhijun He
bf143ff195 Merge "ImageReader: disable NV21 support" into klp-dev 2013-09-18 17:49:30 +00:00
Chet Haase
4fa809fe74 Merge "Fix leak fix in ViewTreeObserver" into klp-dev 2013-09-18 17:48:38 +00:00
Zhijun He
4eda9f5359 ImageReader: disable NV21 support 
Bug: 10787131
Change-Id: I5ff0a67144b5ec49eabde6129423a41c9597c2b8
 2013-09-18 10:30:50 -07:00
Lajos Molnar
161f7c9be8 am 0fe0fe95: am b8462457: Merge "Misc. media API changes" into klp-dev 
* commit '0fe0fe95015040f4b413bfad8c32e125e8d824d0':
  Misc. media API changes
 2013-09-18 10:26:51 -07:00
Lajos Molnar
0fe0fe9501 am b8462457: Merge "Misc. media API changes" into klp-dev 
* commit 'b84624571ba2d0431dda8fd7cd45ae995630dd17':
  Misc. media API changes
 2013-09-18 10:24:16 -07:00
Lajos Molnar
b84624571b Merge "Misc. media API changes" into klp-dev 2013-09-18 17:20:08 +00:00
Lajos Molnar
370da09782 am e3d75c9d: am e23ce3b1: Merge "Add CaptioningManager listener Subtitle support." into klp-dev 
* commit 'e3d75c9dc8d45f3a1f16601e6d20a2fe10d5d479':
  Add CaptioningManager listener Subtitle support.
 2013-09-18 09:53:01 -07:00
Lajos Molnar
e3d75c9dc8 am e23ce3b1: Merge "Add CaptioningManager listener Subtitle support." into klp-dev 
* commit 'e23ce3b1fccd605ab696c120f86bd3912651731c':
  Add CaptioningManager listener Subtitle support.
 2013-09-18 09:49:49 -07:00