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

84753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Jurka
82b38b6655 am 7109aad6: Merge "Fix issue where recents would not show up sometimes" into jb-mr1-dev 
* commit '7109aad6a17dbf8a4292477671b60f155effab38':
  Fix issue where recents would not show up sometimes
 2012-09-17 13:31:28 -07:00
Chet Haase
53615bccc4 am f74d2f2f: Merge "Fix occasional crash bug with layers" into jb-mr1-dev 
* commit 'f74d2f2fe8a157bee25516d2a6ae3e329507cb2c':
  Fix occasional crash bug with layers
 2012-09-17 13:31:25 -07:00
Michael Jurka
7109aad6a1 Merge "Fix issue where recents would not show up sometimes" into jb-mr1-dev 2012-09-17 13:29:03 -07:00
Chet Haase
f74d2f2fe8 Merge "Fix occasional crash bug with layers" into jb-mr1-dev 2012-09-17 13:29:03 -07:00
Romain Guy
3ca90f6788 am 9f5f80e7: Merge "Fix modulation and gamma correction issues" into jb-mr1-dev 
* commit '9f5f80e7a64d9388e3e73763b5c73dcddaa729fc':
  Fix modulation and gamma correction issues
 2012-09-17 13:02:29 -07:00
Romain Guy
9f5f80e7a6 Merge "Fix modulation and gamma correction issues" into jb-mr1-dev 2012-09-17 12:51:08 -07:00
Amith Yamasani
ed29ca9c41 am e645324e: Merge "Add UserManager.getUserIcon()" into jb-mr1-dev 
* commit 'e645324e6bb42075b2e3b37d776e180a51091f96':
  Add UserManager.getUserIcon()
 2012-09-17 12:48:28 -07:00
Amith Yamasani
e645324e6b Merge "Add UserManager.getUserIcon()" into jb-mr1-dev 2012-09-17 12:46:01 -07:00
Amith Yamasani
3b49f07a45 Add UserManager.getUserIcon() 
So that we don't abuse the setUserIcon() for reading. So the new method won't try
to create the file, only return it if it exists.

Change-Id: I7a81d3f1b29d14d37e71f531744ce39f21d827ac
 2012-09-17 12:42:00 -07:00
Xavier Ducrohet
6d35c360d3 am a41d5db2: am 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to aapt." 
* commit 'a41d5db2350108c1d2eceb83b677faed6b7893a8':
  Add --output-text-symbols option to aapt.
 2012-09-17 12:10:30 -07:00
Xavier Ducrohet
8fbe97779a am 9ff22e41: am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt." 
* commit '9ff22e41d05aa66bede1e72767d67dcc2f2d500e':
  Add --error-on-failed-insert option to aapt.
 2012-09-17 12:10:27 -07:00
Xavier Ducrohet
a41d5db235 am 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to aapt." 
* commit '79c95c3b50ff332f9c92430fd10a15eb648a0b02':
  Add --output-text-symbols option to aapt.
 2012-09-17 12:08:36 -07:00
Xavier Ducrohet
9ff22e41d0 am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt." 
* commit '8a67598eb780560b7efe4e1d9944c7cbcf83bbb1':
  Add --error-on-failed-insert option to aapt.
 2012-09-17 12:08:29 -07:00
Xavier Ducrohet
79c95c3b50 am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to aapt." 
* commit '5de9603529ee01a416b5fa31074197565fde4482':
  Add --output-text-symbols option to aapt.
 2012-09-17 12:05:36 -07:00
Xavier Ducrohet
8a67598eb7 am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt." 
* commit 'cc9747ed45302956a3ec9dd21f7b950b837dbfdd':
  Add --error-on-failed-insert option to aapt.
 2012-09-17 12:05:30 -07:00
Xavier Ducrohet
5de9603529 am 31820a35: Merge "Add --output-text-symbols option to aapt." 
* commit '31820a35b2cf864a8dcb71d43e6fd21d54f49a2d':
  Add --output-text-symbols option to aapt.
 2012-09-17 12:03:19 -07:00
Xavier Ducrohet
cc9747ed45 am d7252571: Merge "Add --error-on-failed-insert option to aapt." 
* commit 'd72525718ea7ef3e1f97cf557365b143c8919a5b':
  Add --error-on-failed-insert option to aapt.
 2012-09-17 12:03:12 -07:00
Michael Jurka
cbe69206c0 Fix issue where recents would not show up sometimes 
Change-Id: Iea78f447b71ae23630c76c8982e69c780eef9df6
 2012-09-17 11:51:18 -07:00
Craig Mautner
d202990510 am 178af594: Add debug to help with b/7135184. 
* commit '178af5948d71c841278081c712506f7a7fca34b9':
  Add debug to help with b/7135184.
 2012-09-17 11:36:44 -07:00
Craig Mautner
178af5948d Add debug to help with b/7135184. 
Change-Id: I0d3b60b3e123d35bd557d47e3344ebea1964380b

Conflicts:

	services/java/com/android/server/wm/WindowAnimator.java
 2012-09-17 11:33:25 -07:00
Chet Haase
603f6de35f Fix occasional crash bug with layers 
Launcher occasionally crashes with a stack trace indicating that the memory
of a Layer object is corrupt. It is possible for us to delete a Layer
structure and then, briefly, use it to draw a DisplayList again before
that DisplayList gets recreated (without the layer that got deleted).

When this happens, if the memory got corrupted, it's possible to crash.

The fix is to add Layer to the other objects which we currently refcount
(bitmaps, shaders, etc.). Then instead of deleting a Layer, we decrement the
refcount. We increment when creating it, then increment it again when it's
referenced from a DisplayList. Then we decrement the refcount instead of
deleting it, and decrement when we clear a DisplayList that refers to it.
Then when the refcount reaches 0, we delete it.

Issue #6994632 Native crash in launcher when trying to launch all apps screen

Change-Id: I0627be8d49bb2f9ba8d158a84b764bb4e7df934c
 2012-09-17 11:21:34 -07:00
Irfan Sheriff
9da51f8053 am cc5dd18d: Merge "Change order of ps and suspendmode calls" into jb-mr1-dev 
* commit 'cc5dd18d15a174799ad79d26633c268e8860c8ab':
  Change order of ps and suspendmode calls
 2012-09-17 11:14:44 -07:00
Irfan Sheriff
cc5dd18d15 Merge "Change order of ps and suspendmode calls" into jb-mr1-dev 2012-09-17 11:12:22 -07:00
Irfan Sheriff
9da603c2da Change order of ps and suspendmode calls 
Change-Id: I7872dbea7dc30c57960af95e86eb8e4c7f8e92dc
 2012-09-17 11:07:00 -07:00
Xavier Ducrohet
31820a35b2 Merge "Add --output-text-symbols option to aapt." 2012-09-17 10:59:22 -07:00
Xavier Ducrohet
d72525718e Merge "Add --error-on-failed-insert option to aapt." 2012-09-17 10:57:58 -07:00
Baligh Uddin
09a822d8f4 am c71a57d6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'c71a57d6fa45edf67e79e948b4656fa25a11f1b8':
  Import translations. DO NOT MERGE
 2012-09-17 10:08:24 -07:00
Baligh Uddin
c71a57d6fa Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-17 10:06:21 -07:00
Baligh Uddin
6112ae2c25 am 5dbeb6a8: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '5dbeb6a8ff8ae30f59ba8335c2354b883302428e':
  Import translations. DO NOT MERGE
 2012-09-17 08:58:18 -07:00
Baligh Uddin
5dbeb6a8ff Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-17 08:55:59 -07:00
Siva Velusamy
a04982f072 am 9d7657c5: Merge "PhoneStatusBar: Fix NPE while accessing quick settings." into jb-mr1-dev 
* commit '9d7657c5b569e503a65f1bbe5f0e93309bf33342':
  PhoneStatusBar: Fix NPE while accessing quick settings.
 2012-09-17 08:44:51 -07:00
Siva Velusamy
9d7657c5b5 Merge "PhoneStatusBar: Fix NPE while accessing quick settings." into jb-mr1-dev 2012-09-17 08:42:05 -07:00
Eino-Ville Talvala
ceec2f7f78 am b181909e: Merge "Camera: Document face detection confidence recommendations." into jb-mr1-dev 
* commit 'b181909eefeb8c9b675b1ca25768dcddde9ea0b8':
  Camera: Document face detection confidence recommendations.
 2012-09-17 08:40:44 -07:00
Eino-Ville Talvala
b181909eef Merge "Camera: Document face detection confidence recommendations." into jb-mr1-dev 2012-09-17 08:37:44 -07:00
Eric Laurent
1d75bedfbb am 39a37c3b: Merge "headphone volume limitation" into jb-mr1-dev 
* commit '39a37c3bb3d21c119cca536f85c298db805f86cd':
  headphone volume limitation
 2012-09-17 08:18:50 -07:00
Eric Laurent
39a37c3bb3 Merge "headphone volume limitation" into jb-mr1-dev 2012-09-17 08:16:01 -07:00
Irfan Sheriff
5e2f5fbccd am 89c82814: Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev 
* commit '89c82814dbdfd807b1611a8379be0421cd2f512d':
  Add restoreCallingIdentity under finally
 2012-09-16 18:56:07 -07:00
Irfan Sheriff
89c82814db Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev 2012-09-16 18:53:25 -07:00
Dianne Hackborn
2fba16d19d am 8406d05b: Merge "New uninstall option to uninstall for all users." into jb-mr1-dev 
* commit '8406d05b0fa368f62cda0c0d2b41295f6ac11dc6':
  New uninstall option to uninstall for all users.
 2012-09-16 18:32:00 -07:00
Dianne Hackborn
8406d05b0f Merge "New uninstall option to uninstall for all users." into jb-mr1-dev 2012-09-16 18:29:58 -07:00
Dianne Hackborn
6d235d8265 New uninstall option to uninstall for all users. 
Change-Id: Ie8eb59564078069633a89fc8a92d4f8531baa1aa
 2012-09-16 18:25:40 -07:00
Dianne Hackborn
eb1b5e2f1c am 443e4748: Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn\'t apper to work on secondary user" into jb-mr1-dev 
* commit '443e474881e2b8d2fce0d23c54f8930742d8cdee':
  Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user
 2012-09-16 18:13:33 -07:00
Irfan Sheriff
d2839e64ad am db831da4: Fix permission accessing getCurrentUser 
* commit 'db831da426602f36e4ccf2eae64e999fcc52736a':
  Fix permission accessing getCurrentUser
 2012-09-16 18:13:30 -07:00
Dianne Hackborn
443e474881 Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user" into jb-mr1-dev 2012-09-16 18:07:14 -07:00
Irfan Sheriff
3d33a63391 Add restoreCallingIdentity under finally 
Change-Id: I068b1a2fc93300aa9bd17da6933bc8c5f0a6b5e4
 2012-09-16 17:59:13 -07:00
Eric Laurent
c34dcc1e1e headphone volume limitation 
Limit music volume when headphones or headset are inserted.
Display warning message when user wants to increase the volume
above a platform specific volume and request user acknowledgement
before proceeding.

TODO: exact wording of the warning message must be defined by UX.

Change-Id: I00f429f602534c6d8783126b929371c4d432e6e2
 2012-09-16 17:44:45 -07:00
Irfan Sheriff
db831da426 Fix permission accessing getCurrentUser 
Bug: 7174737
Change-Id: I0a6a9a46f4115743d16ada401cd67e3cf30fb380
 2012-09-16 17:40:59 -07:00
Irfan Sheriff
f4dd0fb23c am 61e8180b: Merge "Fix suspend settings at boot" into jb-mr1-dev 
* commit '61e8180b09a6d64fdb93c867217a97f8084753f1':
  Fix suspend settings at boot
 2012-09-16 17:21:52 -07:00
Irfan Sheriff
61e8180b09 Merge "Fix suspend settings at boot" into jb-mr1-dev 2012-09-16 17:19:21 -07:00
Dianne Hackborn
11f0cb7d07 Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user 
Change-Id: I0ab372978f8599d0fe8d5da8aeb73965ab85797f
 2012-09-16 17:12:34 -07:00