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

125589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
554428c327 Import translations. DO NOT MERGE 
Change-Id: I997192f031eea02fbad2f41370db984dce84b65c
Auto-generated-cl: translation import
 2014-03-17 09:27:08 -07:00
Winson Chung
a1e4bf9b6c Merge "Fixing crash when ActivityManager does not have a proper thumbnail" 2014-03-17 01:54:26 +00:00
Winson Chung
0662038bcb Merge "Simplifying memory management, use Task Keys as resource cache keys." 2014-03-17 01:54:04 +00:00
Steve Moyer
9f2b21792e am 9e6bad83: am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test." 
* commit '9e6bad83608bbe5da07d52c764087496a136ad42':
  Don't attempt to launch disabled activities in smoke test.
 2014-03-16 17:37:55 +00:00
Steve Moyer
9e6bad8360 am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test." 
* commit 'adb3a198beb015ac505aecde585f0c8bca3a29e2':
  Don't attempt to launch disabled activities in smoke test.
 2014-03-16 17:35:30 +00:00
Steve Moyer
adb3a198be am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test." 
* commit '05d855defe8610854592ddd7baf5644ac6d4da15':
  Don't attempt to launch disabled activities in smoke test.
 2014-03-16 17:31:18 +00:00
Steve Moyer
05d855defe am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test." 
* commit 'd93e7b2424b7ab442065b0d9cecb8b72a9c5c8ed':
  Don't attempt to launch disabled activities in smoke test.
 2014-03-16 10:29:25 -07:00
Steve Moyer
d93e7b2424 Merge "Don't attempt to launch disabled activities in smoke test." 2014-03-16 17:26:43 +00:00
Jaewan Kim
f207ec76a5 Merge "EthernetDataTracker: Update hardware address when interface is changed" 2014-03-16 10:23:35 +00:00
John Reck
e2d3f28e85 Merge "Revert "Rename DisplayList->RenderNode"" 2014-03-15 02:15:34 +00:00
John Reck
31f9458908 Revert "Rename DisplayList->RenderNode" 
Missed some test(s), reverting to fix build

This reverts commit ef09d8cf946443e7f4ac4541f843368ac4338c59.

Change-Id: Ifee6c694e5f4b962d03dee200ccbf8dc9662e666
 2014-03-15 02:14:53 +00:00
Winson Chung
7124390f9d Fixing crash when ActivityManager does not have a proper thumbnail 
- Fixing issue with hw layers ref count not properly being incremented and decremented
- Preventing message handler from keeping a strong ref to the RecentsService
 2014-03-14 17:52:47 -07:00
Craig Mautner
b9eab431b6 am 821df858: am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmerge 
* commit '821df858fcc63be8cd7e53e6432a6a17d734412d':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.
 2014-03-15 00:30:58 +00:00
John Reck
759067f39a Merge "Rename DisplayList->RenderNode" 2014-03-15 00:25:34 +00:00
Tim Kilbourn
5dac28f59d am c2b8df82: am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev 
* commit 'c2b8df82d701eb3508da06f75b2201c3f9796373':
  FEATURE_LEANBACK implies that the device is a tv.
 2014-03-15 00:24:44 +00:00
Marco Nelissen
bc3e4e7a4a am 77a00cfe: (-s ours) am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '77a00cfe4b29f180b6f5ed65eddc96422453e191':
  Verify certificates
 2014-03-15 00:24:40 +00:00
Daniel 2 Olofsson
bb54eac7c9 am f1b1855a: am 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach 
* commit 'f1b1855acc623f6137f1d51810948a8149b2a9e8':
  Re-initialize error after attach
 2014-03-15 00:18:09 +00:00
Ruben Brunk
38900b1554 Merge "hal3: Add availableHotPixelModes, update modes." 2014-03-15 00:14:56 +00:00
John Reck
ef09d8cf94 Rename DisplayList->RenderNode 
Change-Id: I1628b6e802252c001ca09ba762f52453b68f4cad
 2014-03-14 17:14:16 -07:00
Craig Mautner
821df858fc am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmerge 
* commit '5b98618f2471cbea8466ec5a4dea0a819a7c0f3c':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.
 2014-03-14 23:57:24 +00:00
Craig Mautner
5b98618f24 am ca0aba39: Merge commit \'54d5702c\' into manualmerge 
* commit 'ca0aba399326886d1a39c2344bab296044ba5eb0':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.
 2014-03-14 23:54:46 +00:00
Winson Chung
04dfe0d26b Simplifying memory management, use Task Keys as resource cache keys. 
- Attempts to load non-topmost task thumbnails from cache
- Ensuring that we release all references to the activity from the bg loader
- Removes background loading debug flag
- Moving callbacks into their respective classes
- cleaning up some callbacks when data is loaded in the bg

Change-Id: Ibb968349d08084922d5b28e432b76a165bf20d6b
 2014-03-14 16:53:45 -07:00
Craig Mautner
ca0aba3993 Merge commit '54d5702c' into manualmerge 
Conflicts:
	services/core/java/com/android/server/am/TaskRecord.java

Change-Id: Id7bc15b6c3e47d8705c228b311c4d85a47c13dbe
 2014-03-14 16:49:50 -07:00
Tim Kilbourn
c2b8df82d7 am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev 
* commit '42dd0bb6b506be81c76cffc7b6f5491c937d4e07':
  FEATURE_LEANBACK implies that the device is a tv.
 2014-03-14 23:37:55 +00:00
Marco Nelissen
77a00cfe4b am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '30260c7e93fa5d5a08c505e1b804849bb56b83f1':
  Verify certificates
 2014-03-14 23:37:52 +00:00
Daniel 2 Olofsson
f1b1855acc am 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach 
* commit '18306520d8afc168df78024d139ed189d8ff7cdb':
  Re-initialize error after attach
 2014-03-14 23:37:49 +00:00
Selim Cinek
defe4b3fdb am 93d279f5: (-s ours) am 1470883e: am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height 
* commit '93d279f562e0fa41be11c25e16df483fd8093b88':
  DO NOT MERGE - Fixed crash for odd image width/height
 2014-03-14 23:33:15 +00:00
Tim Kilbourn
42dd0bb6b5 am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev 
* commit '9539b4a02f74b447db0e3aa1039229f6b913aa87':
  FEATURE_LEANBACK implies that the device is a tv.
 2014-03-14 23:33:11 +00:00
Marco Nelissen
30260c7e93 am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '203a6ddb0c098821ff36511e2a98211a90a69954':
  Verify certificates
 2014-03-14 23:33:02 +00:00
Daniel 2 Olofsson
18306520d8 am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach 
* commit '39fc43b0f91e8d92fc4251e11384c4ea6544cf35':
  Re-initialize error after attach
 2014-03-14 23:33:00 +00:00
Craig Mautner
f8e4b61cef Merge commit '17586ce7' into manualmerge 
Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I4dedf1dc80e224c47cbc020836ad408b641c1d76
 2014-03-14 16:31:07 -07:00
Craig Mautner
a002fab7c7 Merge "Show the keyguard if unsecure window on top" 2014-03-14 23:24:54 +00:00
Craig Mautner
da09ae385a Show the keyguard if unsecure window on top 
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

(cherry picked from commit ab55e524b89c13082193940a5bf8480a2c2522d9)

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
 2014-03-14 16:20:00 -07:00
Tim Kilbourn
9539b4a02f Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev 2014-03-14 23:13:45 +00:00
Marco Nelissen
203a6ddb0c am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '105c47924f7af9319ec9242b952b4bf074585229':
  Verify certificates
 2014-03-14 22:55:50 +00:00
Daniel 2 Olofsson
39fc43b0f9 am 4111e7e1: am 09421fab: Re-initialize error after attach 
* commit '4111e7e17665b1142853c71e9fd1cf6af5f68b82':
  Re-initialize error after attach
 2014-03-14 22:55:45 +00:00
Craig Mautner
54d5702cf8 am 477897ad: Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev 
* commit '477897ad7b0725fa68d32a94bf8c24264068fd5c':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.
 2014-03-14 22:36:15 +00:00
Marco Nelissen
105c47924f am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '10a07a043f7fa47148ae2cc2fcd6b0edeb52190b':
  Verify certificates
 2014-03-14 22:32:02 +00:00
Craig Mautner
477897ad7b Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev 2014-03-14 22:30:04 +00:00
Craig Mautner
fdf28cc4be Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE. 
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.

Fixes bug 12171535.

Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
 2014-03-14 22:28:07 +00:00
Daniel 2 Olofsson
4111e7e176 am 09421fab: Re-initialize error after attach 
* commit '09421fab0784bcfc6660a09d02faea7835c28e31':
  Re-initialize error after attach
 2014-03-14 22:27:52 +00:00
Marco Nelissen
10a07a043f Merge "Verify certificates" into klp-dev 2014-03-14 22:27:23 +00:00
Yohei Yukawa
8959ad36c4 am 43bfed54: (-s ours) am c05362b8: am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls 
* commit '43bfed5430f8c0b042ad229370a9d1fe95eb6156':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
 2014-03-14 22:23:05 +00:00
Craig Mautner
e5aefea0d7 am ce805c7c: am 8a6ab821: am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev 
* commit 'ce805c7ce475eead0e4e3326070d7dc2983d4e70':
  Fix activities appearing behind launcher icons
 2014-03-14 22:23:02 +00:00
Selim Cinek
93d279f562 am 1470883e: am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height 
* commit '1470883e0716af4e3f4014e2ef427aae67286fc8':
  DO NOT MERGE - Fixed crash for odd image width/height
 2014-03-14 22:03:09 +00:00
Craig Mautner
17586ce7a6 am 5df673d9: am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge 
* commit '5df673d915ef9c9d4466ff1a7eeaf62f908c7aff':
  Show the keyguard if unsecure window on top
 2014-03-14 22:03:06 +00:00
Yohei Yukawa
43bfed5430 am c05362b8: am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls 
* commit 'c05362b84cd55f6bac20a373b74f66a79577109d':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
 2014-03-14 22:03:03 +00:00
Craig Mautner
ce805c7ce4 am 8a6ab821: am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev 
* commit '8a6ab82114058eedc6aeb29902f0f3926a33a0c6':
  Fix activities appearing behind launcher icons
 2014-03-14 22:03:00 +00:00
Selim Cinek
1470883e07 am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height 
* commit '149fd6d84d53c7f509418048b931ff2c45e8deb4':
  DO NOT MERGE - Fixed crash for odd image width/height
 2014-03-14 21:59:42 +00:00
Craig Mautner
5df673d915 am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge 
* commit 'f6f0946addc5230634ac2a09115097531dc6094b':
  Show the keyguard if unsecure window on top
 2014-03-14 21:59:39 +00:00