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

125754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yohei Yukawa
c05362b84c am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls 
* commit '77943308f5661636d85cb5e78188dbbc8f0e329e':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
 2014-03-14 21:59:35 +00:00
Craig Mautner
8a6ab82114 am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev 
* commit 'c6103803cb24dafd2cb056dbac040a046b7ed12d':
  Fix activities appearing behind launcher icons
 2014-03-14 21:59:33 +00:00
Selim Cinek
149fd6d84d am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height 
* commit '9c3fc0cc6003c4f66f32d8e5f22a4f3e7d22f817':
  DO NOT MERGE - Fixed crash for odd image width/height
 2014-03-14 21:55:05 +00:00
Craig Mautner
f6f0946add am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge 
* commit '00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2':
  Show the keyguard if unsecure window on top
 2014-03-14 21:54:52 +00:00
Yohei Yukawa
77943308f5 am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls 
* commit 'fd2f8d43419d1f25ced8b2bac96407925dd4c471':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
 2014-03-14 21:54:49 +00:00
Craig Mautner
c6103803cb am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev 
* commit 'a921d8b6b1a3478f258b9999ed909907216edbae':
  Fix activities appearing behind launcher icons
 2014-03-14 21:54:45 +00:00
Mike Lockwood
9428eb82c0 am c5353ce3: am 685831bf: am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev 
* commit 'c5353ce373f02b549ed9e63aa23f94ca1a726f7e':
  UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
 2014-03-14 21:54:13 +00:00
Mike Lockwood
c5353ce373 am 685831bf: am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev 
* commit '685831bf8da4f89366ce16c1852f25efad046261':
  UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
 2014-03-14 21:50:44 +00:00
Daniel 2 Olofsson
09421fab07 Re-initialize error after attach 
If flag for error after attach is not reinitialized, it may cause
NullPointerException on subsequent onAttachedWindow if error text
was reset to null.

Change-Id: I8976c28a6ca71017e5c4b3f29d4eeeb2eda48c38
 2014-03-14 14:49:23 -07:00
Mike Lockwood
685831bf8d am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev 
* commit 'f9b90434ef04b509c7dcb868d50aa53a66b97809':
  UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
 2014-03-14 21:47:37 +00:00
Craig Mautner
421a1dd197 Merge "Launch new tasks with Doc Centric flag." 2014-03-14 21:43:28 +00:00
Mike Lockwood
f9b90434ef am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev 
* commit 'ff64f5ed7c2b55878d149d546092e029cba15465':
  UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
 2014-03-14 21:42:58 +00:00
Craig Mautner
d00f47402c Launch new tasks with Doc Centric flag. 
Introduction of new Intent flag FLAG_ACTIVITY_NEW_DOCUMENT. When
this flag is set the target activity will be launched in its own
task. This is the start of the new Doc Centric mode of working.

Change-Id: I719168532134ab2c5ea3300df676c2b2a0e81795
 2014-03-14 14:42:23 -07:00
Dave Allison
dbcd5b70ca am 273fe6a3: am 4a02e071: am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope" 
* commit '273fe6a327de8051ac075855ceb7b33a9422c7a7':
  Move options buffers to top scope
 2014-03-14 21:35:51 +00:00
Dave Allison
273fe6a327 am 4a02e071: am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope" 
* commit '4a02e0716d43bd2bf9b96a8b1dae181f9c35dcbf':
  Move options buffers to top scope
 2014-03-14 21:26:09 +00:00
Dave Allison
4a02e0716d am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope" 
* commit '788fb96d7f1cfe27cf8dd56a053258964427286f':
  Move options buffers to top scope
 2014-03-14 21:21:50 +00:00
Dave Allison
788fb96d7f am 47653f2d: Merge "Move options buffers to top scope" 
* commit '47653f2d0823bcebefc23cc2441db1f8d9e55b4c':
  Move options buffers to top scope
 2014-03-14 14:18:40 -07:00
Deepanshu Gupta
a72da3aec6 Merge "Add native method delegates to layoutlib" 2014-03-14 21:16:22 +00:00
Dave Allison
47653f2d08 Merge "Move options buffers to top scope" 2014-03-14 21:15:25 +00:00
Dave Allison
07a1e2323b Move options buffers to top scope 
It is important that the char buffers for options do
not go out of scope as the mOptions.add() does not copy
the buffer.  This moves all the buffers to the top
level scope of the function to prevent accidental
overwriting when they go out of scope.

Bug: 13448497
Change-Id: I5a97ddd32ff34f237915927906e1e1f833ff036e
 2014-03-14 21:15:08 +00:00
Tim Kilbourn
9b18001ab5 am ec033943: am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev 
* commit 'ec0339437869ebb42a67a2811dc6de31239d5d62':
  Add leanback device features.
 2014-03-14 20:50:40 +00:00
Selim Cinek
9c3fc0cc60 am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height 
* commit 'eb95e74e21a0e910704ca2fd67e074ab640bfba3':
  DO NOT MERGE - Fixed crash for odd image width/height
 2014-03-14 20:47:34 +00:00
Tim Kilbourn
ec03394378 am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev 
* commit '9873e099c32513cdb28c3ffb8c2306ad87f0b052':
  Add leanback device features.
 2014-03-14 20:47:03 +00:00
Tim Kilbourn
0722968c59 FEATURE_LEANBACK implies that the device is a tv. 
For managing the ui mode, consider the device to be a television if it
has either the FEATURE_TELEVISION or FEATURE_LEANBACK system features.

When leanback is available for non-television devices, we need to
reconsider the use of these features for setting the television ui mode.

Change-Id: I7b82372ce19067e010be9b42111816bab186f95b
 2014-03-14 13:44:12 -07:00
Tim Kilbourn
9873e099c3 am 55740325: Merge "Add leanback device features." into klp-modular-dev 
* commit '557403250b9accf4f17ab87f636f1722949960a3':
  Add leanback device features.
 2014-03-14 20:42:18 +00:00
Tim Kilbourn
557403250b Merge "Add leanback device features." into klp-modular-dev 2014-03-14 20:38:51 +00:00
Ruben Brunk
9d454fd609 hal3: Add availableHotPixelModes, update modes. 
Bug: 12957573
Change-Id: I2fd6ef60bf98c53288c2bc343d82a06602474916
 2014-03-14 13:35:57 -07:00
Winson Chung
050b39bd5f Merge "Fixing memory leaks related to Tasks holding onto their callbacks." 2014-03-14 20:34:27 +00:00
Deepanshu Gupta
103d40960d Add native method delegates to layoutlib 
Add delegates for Path.native_isConvex and ICU.getCurrencyNumericCode.
The original methods were added in
5be83edd15e11420287cc0af93a95d5a6dfae68f and
d627bd4525e41b0503f94c2887c3e01618c73105 respectively.

TODO: Implement Path_Delegate.native_isConvex

Change-Id: If1046467d3950ab6955c6b81383a60fd6bd03fd2
 2014-03-14 13:31:12 -07:00
Selim Cinek
eb95e74e21 DO NOT MERGE - Fixed crash for odd image width/height 
Due to an internal rounding in the renderer, the calculations
for the cropping area could be slightly offset, getting out
of the image boundaries. I sanitized the rect by ensuring they
are inside the image.

Bug: 12174629
Change-Id: Icc37790732ddd479631b898b23c05501d2dcd5be
 2014-03-14 20:11:17 +00:00
Christopher Tate
5e0e7b56a9 Merge "Make RegisteredServicesCache understand ASEC-based updates" 2014-03-14 19:16:07 +00:00
Victoria Lease
09d47bbb43 am c2d934d7: am f8ce43ea: am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call" 
* commit 'c2d934d7e87b9eb8cbb15ccc0c39b13ad32de460':
  remove unnecessary switchUser call
 2014-03-14 18:01:38 +00:00
Victoria Lease
c2d934d7e8 am f8ce43ea: am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call" 
* commit 'f8ce43ea146cace780cb4f75348d4eca4526660a':
  remove unnecessary switchUser call
 2014-03-14 17:57:32 +00:00
Victoria Lease
f8ce43ea14 am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call" 
* commit '1365d98270e0a0a61d10743820e923aeff974b39':
  remove unnecessary switchUser call
 2014-03-14 17:54:32 +00:00
Ricardo Cervera
4656ac9fe6 am d387206a: am 7890eeff: am 882ba89b: am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs 
* commit 'd387206a84a35b86663adb5bf00671cafbf6aee4':
  docs: Updated Building your First App tutorial. Bug: 13429905
 2014-03-14 17:54:11 +00:00
Joe Fernandez
cfa561cad8 am 53edba8d: am 571c171e: am 58f019a6: am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs 
* commit '53edba8d5cae3ea385f64ee980399278bb5a76fd':
  Doc change: Update developer video on home page carousel.
 2014-03-14 17:54:07 +00:00
John Spurlock
e418c77e8d am 88f65e01: am 4108431b: am 28ac0c10: am ad66c27b: am 6d9b034c: Fix typo in public logcat page. 
* commit '88f65e01d28c8f22d77624d1c8b264c761f3ac2a':
  Fix typo in public logcat page.
 2014-03-14 17:54:03 +00:00
Ricardo Cervera
281f208245 am b063df4d: am c12c92bb: am 784aab78: am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs 
* commit 'b063df4d27772aa9d71805acbb70b4473ad4b58d':
  docs: Added step to get JDK to the Android Studio install instructions.
 2014-03-14 17:54:00 +00:00
Katie McCormick
89da4c8aeb am e612874b: am 9c5c5a87: am 8e142bbb: am b681794d: am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs 
* commit 'e612874b4c684f3d466d76a2e1a75fec066108f5':
  Doc update: new doc studio layout editor
 2014-03-14 17:53:56 +00:00