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

118894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
af17925f94 am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager" 
* commit '45b68ac3a7acb7af95fdfc5c0e31560b3c28c9f8':
  [ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
 2014-01-28 18:17:31 +00:00
Craig Mautner
45b68ac3a7 am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager" 
* commit '093256279c308fd3cad290a1b01c5d313bace8af':
  [ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
 2014-01-28 18:13:55 +00:00
Craig Mautner
093256279c am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager" 
* commit '245b58d6f47740c09ebd47b75e6021c7cfb691af':
  [ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
 2014-01-28 18:11:13 +00:00
Craig Mautner
245b58d6f4 am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager" 
* commit 'baf2c7a400ef27b1f33999498a80e2fb3e05a22f':
  [ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
 2014-01-28 10:08:18 -08:00
Craig Mautner
baf2c7a400 Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager" 2014-01-28 18:05:31 +00:00
louis_chang
d5c91ece7b [ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager 
Symptom:
When press Home key to home screen, user is able to see the activity's window shown on top of wallpaper and below launcher(widgets).

Root Cause:
The ensureActivitiesVisibleLocked() is called pretty often (for example when a new process bound).
If the top activity "B" was finishing, then the previous activity "A" should be visible.
Therefore, the activity "A" window will be set to visible and then launched activity "A", but it does not updates the visible state in ActivityRecord for "A".
There has a timing issue that if a new activity "C" is started, "C" becomes the new top activity and be resumed.
In that case, Activity "A" window will remain visible even if it is behind a full screen activity "C" because the ActivityRecord.visble of "A" is still false, so the window visibility won't be update.
So when user press home key and back to launcher, the surface of activity "A" will be composed on top of wallpaper.

Solution:
Updates ActivityRecord.visible to true for "A". After "C" is started, the "A" will be called WindowManagerService.setAppVisibility() to set invisible, then called onStop() when execute ensureActivitiesVisibleLocked() again.

Change-Id: I536ba04b95d8d274fea6d679a6493e620bc981e2
 2014-01-28 18:38:06 +08:00
Mike J. Chen
bfa3f4fd5c Merge "BluetoothInputDevice: make REPORT_TYPE values match hal" into klp-modular-dev 2014-01-28 01:28:36 +00:00
Mike J. Chen
1b47f7cc1a BluetoothInputDevice: make REPORT_TYPE values match hal 
So we don't have to do conversion when using getReport/setReport
and can pass the value to the BT HAL directly.

Change-Id: I8d4af72d2e040d43cc9ff8a8cddfbe6cc8cfdb9a
Signed-off-by: Mike J. Chen <mjchen@google.com>
 2014-01-27 16:27:04 -08:00
Jeff Brown
df8b604e9b Merge "Fix NPE in deleteDatabase()." into klp-modular-dev 2014-01-28 00:09:42 +00:00
Jeff Brown
065d998a4c Merge "Hide an old debug function." into klp-modular-dev 2014-01-28 00:09:07 +00:00
Christopher Tate
86824cf0a9 am 3a3def13: am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference." 
* commit '3a3def1304b0fa9ed72003882716ad43e85b13d3':
  Fixed race condition in Spinner.DialogPopup on null reference.
 2014-01-27 19:54:30 +00:00
Mathieu Chartier
698d367317 am 4a750c1f: am 15594557: am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp." 
* commit '4a750c1f4a2760ae564fa56717c04a5f01396090':
  Fix dest == src bugs in Matrix.cpp.
 2014-01-27 19:49:35 +00:00
Christopher Tate
3a3def1304 am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference." 
* commit '0e8f02d68f8cfe14e14800520a8133bc7efd13b7':
  Fixed race condition in Spinner.DialogPopup on null reference.
 2014-01-27 19:48:03 +00:00
Christopher Tate
0e8f02d68f am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference." 
* commit '76dcacada75f192d74ea83cf6b5ce1747c9437ad':
  Fixed race condition in Spinner.DialogPopup on null reference.
 2014-01-27 11:43:23 -08:00
Christopher Tate
76dcacada7 am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference." 
* commit '1ff4293e33f98e6dc19e4f154cb497af9bd88c9d':
  Fixed race condition in Spinner.DialogPopup on null reference.
 2014-01-27 11:40:51 -08:00
Mathieu Chartier
4a750c1f4a am 15594557: am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp." 
* commit '15594557f118f670e8d8523e9aed0df3345d28ca':
  Fix dest == src bugs in Matrix.cpp.
 2014-01-27 19:30:35 +00:00
Christopher Tate
1ff4293e33 Merge "Fixed race condition in Spinner.DialogPopup on null reference." 2014-01-27 19:29:56 +00:00
Mathieu Chartier
15594557f1 am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp." 
* commit '137d74d89cc57d146af8ca91ad7830a950c7e8b8':
  Fix dest == src bugs in Matrix.cpp.
 2014-01-27 11:20:21 -08:00
Mathieu Chartier
137d74d89c am db525724: Merge "Fix dest == src bugs in Matrix.cpp." 
* commit 'db5257248637df729ec4f8db58bdfbf0660051b2':
  Fix dest == src bugs in Matrix.cpp.
 2014-01-27 11:17:13 -08:00
Griff Hazen
e2bb257c34 Merge "Make MANAGE_ACTIVITY_STACKS a signature|system permission." into klp-modular-dev 2014-01-27 18:31:15 +00:00
Mathieu Chartier
db52572486 Merge "Fix dest == src bugs in Matrix.cpp." 2014-01-27 17:26:48 +00:00
Narayan Kamath
1cd2834fde am 30e20ac5: am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*." 
* commit '30e20ac528731a778eec45506d1e57c8839b318a':
  AssetManager cookies should be int32_t and not void*.
 2014-01-27 12:07:15 +00:00
Narayan Kamath
30e20ac528 am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*." 
* commit 'ebd43d46ebf53005ae60af59948f8ed634f9bafb':
  AssetManager cookies should be int32_t and not void*.
 2014-01-27 12:04:30 +00:00
Narayan Kamath
ebd43d46eb am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*." 
* commit 'dff83e2b121b356a264e908f8a7d64584eab9b73':
  AssetManager cookies should be int32_t and not void*.
 2014-01-27 04:01:15 -08:00
Narayan Kamath
dff83e2b12 am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*." 
* commit 'd5970e9ca34038051f694c7349fa5f3548ee9499':
  AssetManager cookies should be int32_t and not void*.
 2014-01-27 03:58:32 -08:00
Narayan Kamath
d5970e9ca3 Merge "AssetManager cookies should be int32_t and not void*." 2014-01-27 11:56:03 +00:00
Narayan Kamath
745d4efc83 AssetManager cookies should be int32_t and not void*. 
Cookies are really indices into vectors and arrays, so
they don't need to be void*. We choose int32_t instead
of size_t to allow their width to be well specified.

(cherry picked from commit ebfdd0f467e39c3af8d92cade78263935340acb7)
(cherry picked from commit a7fa2e592e2e579e5acdb903dba83fc074ebc215)
(cherry picked from commit a9d5701b034ed2d9771b3f0943e1add00741d7cd)

Change-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda
 2014-01-27 11:20:24 +00:00
Griff Hazen
9e24357ddb Make MANAGE_ACTIVITY_STACKS a signature|system permission. 
To allow ActivityView support within privileged apps.

Change-Id: Ic0246939bf71c52ca9415149415a976537c8270b
 2014-01-26 21:58:51 -08:00
Wink Saville
dafb2420a3 am d4b688cf: am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8." 
* commit 'd4b688cf97736eb4c543149686ab851b9ea21161':
  Telephony: Modify code to check that PUK code length is always 8.
 2014-01-26 16:55:49 +00:00
Wink Saville
d4b688cf97 am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8." 
* commit 'd165f365b394b7632d8a0cfbc14bbf4004858333':
  Telephony: Modify code to check that PUK code length is always 8.
 2014-01-26 16:52:26 +00:00
Wink Saville
d165f365b3 am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8." 
* commit '5d2d911ad1f69392cf2a56237ce7ad3bb9e78ffa':
  Telephony: Modify code to check that PUK code length is always 8.
 2014-01-26 08:49:09 -08:00
Wink Saville
5d2d911ad1 am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8." 
* commit 'd1eeb6747820f549ec724546a84e3860b4580587':
  Telephony: Modify code to check that PUK code length is always 8.
 2014-01-26 08:43:28 -08:00
Mathieu Chartier
768480c245 Fix dest == src bugs in Matrix.cpp. 
The main bug was that the AutoJavaFloatArray autoSrc was not passing in
read only. This meant that the destructor overwrote the data which
the autoDst AutoJavaFloatArray had written in it's destructor.
This case only happened if src == dest and the arrays were copies.
Also improved performance by passing in read only a few other places.

Bug: 12570144

Change-Id: Idc8764087dc165433c584b87a0f9d4ed0ec795e8
 2014-01-25 17:54:22 -08:00
Wink Saville
d1eeb67478 Merge "Telephony: Modify code to check that PUK code length is always 8." 2014-01-25 21:51:34 +00:00
Craig Mautner
38eda9c42b Remove unnecessary logging. 
Fixes bug 12593710.

Change-Id: I55c33bb4d6c9e17e810be7cc033e01fb9d2d6cf7
 2014-01-24 17:26:52 -08:00
Jeff Brown
fce5890a11 Fix NPE in deleteDatabase(). 
If the directory containing the database does not exist then
listFiles() will return null.  Tolerate this situation instead
of crashing.

Bug: 12600784
Change-Id: I5d83a867a5e8478f50887e5798b42c5f6859b77c
 2014-01-24 13:20:57 -08:00
Jeff Brown
8aca9e335f Hide an old debug function. 
Change-Id: If12b967955847d257dac0431dabe0dca41865b58
 2014-01-24 13:10:19 -08:00
Narayan Kamath
5d094b947b am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit 'aa43eb518ce3c50c1b9a64fc526c8d1360d3789e':
  Remove unused field from AssetManager.
 2014-01-24 09:48:36 +00:00
Narayan Kamath
aa43eb518c am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '7866f2fcfa753154a492bfb3fb21061f6fcce709':
  Remove unused field from AssetManager.
 2014-01-24 09:45:13 +00:00
Narayan Kamath
7866f2fcfa am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '8005b9af11ea366672d739769510240f931f3050':
  Remove unused field from AssetManager.
 2014-01-24 01:42:08 -08:00
Narayan Kamath
8005b9af11 am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '3c30eff63fb33901df4e040ecce78f7755be588f':
  Remove unused field from AssetManager.
 2014-01-24 01:39:47 -08:00
Narayan Kamath
3c30eff63f Merge "Remove unused field from AssetManager." 2014-01-24 09:27:48 +00:00
Selim Gurun
2474ebe879 am 0a33c4f9: am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit '0a33c4f9f54b59dac4e745e09db05990d53a1aba':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 22:46:56 +00:00
Selim Gurun
0a33c4f9f5 am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit '6735020adbcc7028185ca536e2b2cb49ec7687fb':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 22:42:00 +00:00
Selim Gurun
6735020adb am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit 'd261243c146515184cb4caf2284c6764a045443a':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 14:39:53 -08:00
Selim Gurun
d261243c14 am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit 'a3106d1dbe5141a6df742262f4bbe8cf2c8ea915':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 14:37:15 -08:00
Selim Gurun
a3106d1dbe Merge "Revert "Adding freeMemoryForTests static method to WebView."" 2014-01-23 22:26:33 +00:00
Selim Gurun
355ed4ac43 Revert "Adding freeMemoryForTests static method to WebView." 
This reverts commit c6a2a6e20f7ddd5a903e9395f6c574c316960694.

Change-Id: If9e1b3420ee239ab3166850e853d5949821f99e1
 2014-01-23 22:13:40 +00:00
Selim Gurun
647c5160a2 am b311739d: am d9c2e3d3: am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit 'b311739d6fd2fdc5a3607ad79a1547af8500cfae':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 19:59:19 +00:00
Selim Gurun
b311739d6f am d9c2e3d3: am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit 'd9c2e3d30f7af615ae78848f6a7f52ed5c539d33':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 19:54:15 +00:00