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

35859 Commits

Author SHA1 Message Date
Jeff Hamilton
ba2c79a59f am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev 
* commit 'e09aed49e3498c9e0f3545ab97f816233d5eac66':
  Changes to support updating location providers.
 2012-10-18 12:47:31 -07:00
Jeff Hamilton
e09aed49e3 Merge "Changes to support updating location providers." into jb-mr1-dev 2012-10-18 12:45:02 -07:00
Christopher Tate
3220289383 am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev 
* commit '1ea75b88b7ac4273b7a5395c5c57c6453d6cd3d1':
  Sanity-check erroneous backup agent instantiations
 2012-10-18 12:18:48 -07:00
Christopher Tate
2f29659852 am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev 
* commit '1ea75b88b7ac4273b7a5395c5c57c6453d6cd3d1':
  Sanity-check erroneous backup agent instantiations
 2012-10-18 12:18:42 -07:00
Scott Main
c88e918482 am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev 
* commit 'db164da885d15723597d6a525d0f46cb55dbcb88':
  improve some docs for dreams
 2012-10-18 12:18:42 -07:00
Scott Main
aefc2e6233 am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev 
* commit 'db164da885d15723597d6a525d0f46cb55dbcb88':
  improve some docs for dreams
 2012-10-18 12:18:38 -07:00
Christopher Tate
1ea75b88b7 Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev 2012-10-18 12:07:03 -07:00
Scott Main
6237ac19bf improve some docs for dreams 
Change-Id: I7652f4366cdc8c40926d7961582663cc99ca0735
 2012-10-18 11:18:31 -07:00
Jeff Sharkey
e21a2e72a7 am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev 
* commit 'bd4f2181077ab35a26bcca115c1337e78814bb9d':
  Defer more Account actions until user starting.
 2012-10-18 00:03:51 -07:00
Jeff Sharkey
628025fd62 am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev 
* commit 'bd4f2181077ab35a26bcca115c1337e78814bb9d':
  Defer more Account actions until user starting.
 2012-10-18 00:03:43 -07:00
Jeff Sharkey
bd4f218107 Merge "Defer more Account actions until user starting." into jb-mr1-dev 2012-10-18 00:00:41 -07:00
Jeff Hamilton
fbadb69978 Changes to support updating location providers. 
This reverts commit 20de160ca32a8f2936a80ffd70551a22e2371d25.

Bug: 7242814
Change-Id: I9ec49a14feb835b6683186fc6da4a74ae19fbae2
 2012-10-18 01:28:10 -05:00
Baligh Uddin
3e336bd646 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-17 22:23:35 -07:00
Baligh Uddin
080fa75371 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-17 22:19:21 -07:00
Romain Guy
650c47a190 am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev 
* commit 'b8460d153a1e6dfc6a02ab127d4b5b5e82386137':
  Take into account the texture layer's transform for clipping Bug #7370212
 2012-10-17 19:19:07 -07:00
Romain Guy
07a9ebd1a0 am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev 
* commit 'b8460d153a1e6dfc6a02ab127d4b5b5e82386137':
  Take into account the texture layer's transform for clipping Bug #7370212
 2012-10-17 19:18:24 -07:00
Romain Guy
b8460d153a Merge "Take into account the texture layer's transform for clipping Bug #7370212" into jb-mr1-dev 2012-10-17 19:16:11 -07:00
Jeff Brown
d488b23143 am 23fa0320: Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev 
* commit '23fa0320b88bd2141742d47eaf2626369cb03b22':
  Add a notification icon when connected to wireless display.
 2012-10-17 18:45:14 -07:00
Jeff Brown
56fa32bcdf am 23fa0320: Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev 
* commit '23fa0320b88bd2141742d47eaf2626369cb03b22':
  Add a notification icon when connected to wireless display.
 2012-10-17 18:44:43 -07:00
Jeff Brown
23fa0320b8 Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev 2012-10-17 18:42:25 -07:00
Baligh Uddin
917d8ac7fe Import translations. DO NOT MERGE 
Change-Id: I246d542b8032726b5ba49141f841cf23c208e7f7
Auto-generated-cl: translation import
 2012-10-17 18:38:36 -07:00
Baligh Uddin
5e997383ad Import translations. DO NOT MERGE 
Change-Id: Id28c1f2850ae312444163c119f0828259fb0b346
Auto-generated-cl: translation import
 2012-10-17 18:36:20 -07:00
Romain Guy
b2e2f24706 Take into account the texture layer's transform for clipping 
Bug #7370212

Change-Id: Ibdc3161306f54a1cfe66e08458f05ee01a13b1df
 2012-10-17 18:18:35 -07:00
Justin Ho
76a0142477 am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '871a6d7d4fb3bffaff37e45f0b4f5e3c862239d2':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 16:00:37 -07:00
Justin Ho
c35f76508e am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 
* commit '4db3165793a837ffc8197184fbc13ef2217e3dfc':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
 2012-10-17 15:58:52 -07:00
Justin Ho
54a956ca42 am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '871a6d7d4fb3bffaff37e45f0b4f5e3c862239d2':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 15:57:44 -07:00
Justin Ho
871a6d7d4f Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 2012-10-17 15:55:15 -07:00
Justin Ho
195eb1abc8 am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 
* commit '4db3165793a837ffc8197184fbc13ef2217e3dfc':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
 2012-10-17 15:55:00 -07:00
Justin Ho
4e360f0600 Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." 
This reverts commit f49d835dfe1bd21920ff8a48cbdfb9c1fd632fd9

Change-Id: If0093f23d6458e53619220fbf0aa5f844ad2c790
 2012-10-17 15:54:20 -07:00
Justin Ho
4db3165793 Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 2012-10-17 15:53:02 -07:00
Justin Ho
f49d835dfe This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height. 
This reverts commit 57fca90ac65ecfe97acd4c93d442c3db8f815e11

Change-Id: I0fe25056cd54b8852b32ae4621e048d3f5c7d555
 2012-10-17 15:50:48 -07:00
Jeff Brown
a7f9c966bc Add a notification icon when connected to wireless display. 
Bug: 7350174
Change-Id: I18481e2a1445b0aa3340e5d9b02511394521e50e
 2012-10-17 15:50:06 -07:00
Jeff Sharkey
e4996bbd51 Defer more Account actions until user starting. 
Instead of explicitly scanning OWNER accounts, move to using the
"user starting" call path for consistency.

Bug: 7358086
Change-Id: Ied3289a074aafa48259d828db1d68804912589b3
 2012-10-17 15:05:52 -07:00
Chet Haase
6871671063 am 6f3e7bbf: Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev 
* commit '6f3e7bbf14d43553dfca6a59bbbb1c6ee19a70fc':
  Fix for previous commit on non-interesecting invalidations
 2012-10-17 14:55:50 -07:00
Chet Haase
285d09320e am 6f3e7bbf: Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev 
* commit '6f3e7bbf14d43553dfca6a59bbbb1c6ee19a70fc':
  Fix for previous commit on non-interesecting invalidations
 2012-10-17 14:55:50 -07:00
Chet Haase
6f3e7bbf14 Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev 2012-10-17 14:52:47 -07:00
Romain Guy
08ab69bd92 am 3301654a: Merge "Fix javadoc" into jb-mr1-dev 
* commit '3301654a541b5743b6538ce1e161c35330673949':
  Fix javadoc
 2012-10-17 14:39:41 -07:00
Romain Guy
6763bfe4ce am 3301654a: Merge "Fix javadoc" into jb-mr1-dev 
* commit '3301654a541b5743b6538ce1e161c35330673949':
  Fix javadoc
 2012-10-17 14:39:26 -07:00
Chet Haase
9911d18f0e Fix for previous commit on non-interesecting invalidations 
An error in the logic meant that some valid invalidations weren't getting through,
causing Launcher (for one) to get stuck sometimes.

Change-Id: I180622623b19770cd61034a5bd7991a5e2fd0a64
 2012-10-17 14:37:48 -07:00
Romain Guy
3301654a54 Merge "Fix javadoc" into jb-mr1-dev 2012-10-17 14:36:18 -07:00
Geremy Condra
c29f35b8f4 Change android.permission.SERIAL_PORT to signature|system. 
Bug: 7367956
Change-Id: I0bc65936ba59c43c18d9a6ba52affff4c921f2fb
 2012-10-17 14:06:31 -07:00
Christopher Tate
346acb123d Sanity-check erroneous backup agent instantiations 
Two distinct changes:

Fix a bug seen in the wild where a newly-launched application will be
spuriously asked to instantiate a backup agent.  What was happening
there is that some Activity Manager state was being left stale in certain
circumstances, and then in combination with app uninstall / install, there
could be a case where uid reuse wound up looking like an app identity
match.

We now positively verify before instantiating the agent that the intended
backup target package is uid-compatible with the app process that the
instantiation was requested of.  The incomplete bookkeeping in the
Activity Manager has also been tightened up, and the Backup Manager is
more aggressive about cleaning up pending operations pertaining to
apps being uninstalled.

Bug 5874010

Change-Id: Ic389f4a96c9dcd0ba6b3962b579084033d8ae9f8
 2012-10-17 13:36:15 -07:00
Xia Wang
aeadc3d86a am 64e5aa73: Merge "Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674" into jb-mr1-dev 
* commit '64e5aa73c549e006a0e6ce1030c88206c781dc1a':
  Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674
 2012-10-17 12:44:23 -07:00
Xia Wang
474c56d38a am 64e5aa73: Merge "Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674" into jb-mr1-dev 
* commit '64e5aa73c549e006a0e6ce1030c88206c781dc1a':
  Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674
 2012-10-17 12:42:46 -07:00
Xia Wang
64e5aa73c5 Merge "Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674" into jb-mr1-dev 2012-10-17 12:40:13 -07:00
Chet Haase
d348ec204b am d95316e2: Merge "Skip drawing offscreen objects" into jb-mr1-dev 
* commit 'd95316e2c78c7e6cfacac9cced66f7ace36d6497':
  Skip drawing offscreen objects
 2012-10-17 12:38:53 -07:00
Chet Haase
e31cc17159 am d95316e2: Merge "Skip drawing offscreen objects" into jb-mr1-dev 
* commit 'd95316e2c78c7e6cfacac9cced66f7ace36d6497':
  Skip drawing offscreen objects
 2012-10-17 12:38:25 -07:00
Chet Haase
d95316e2c7 Merge "Skip drawing offscreen objects" into jb-mr1-dev 2012-10-17 12:36:24 -07:00
Xia Wang
2ab453b52b Fix connectivity manager test for tablet with data connection, multi-user support 
bug#7366674

Change-Id: Ibbb4becebfc833529e85d8a311366586c5ba54ee
 2012-10-17 12:03:29 -07:00
Chet Haase
b78ee0ef60 Skip drawing offscreen objects 
Previous logic in ViewRoot would schedule and perform a draw
when it was requested by offscreen objects. The problem was that the
logic checking for an interesection between the offscreen invalidation rectangle
and the onscreen display rectangle was flawed. The fix was to use the return value
from Rect.intersect() to do the right thing and skip drawing.

Issue #7366568 Offscreen invalidates can cause useless work for framework

Change-Id: Ie4e277c695dacee39848a8a223f0c4ee34d9bb4d
 2012-10-17 11:32:01 -07:00