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

86830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
25f5a71f31 am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit '17f36d154f1a8ebe72fc35af332f5c0069503364':
  Allow phone to go to sleep while in call.
 2012-10-04 17:35:29 -07:00
Jeff Brown
17f36d154f Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 2012-10-04 17:32:46 -07:00
Amith Yamasani
344e019ace am 82245c19: Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 
* commit '82245c199b2bbd2f598ce3c863eea425b4909cac':
  Fix dupes in initial wallpaper selection
 2012-10-04 17:30:49 -07:00
Amith Yamasani
82245c199b Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 2012-10-04 17:29:34 -07:00
Victoria Lease
fddea6042e am dfc8e799: Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev 
* commit 'dfc8e799ed7500c1a07d4ba1f72e77d3de0f803a':
  Handle other providers in isAllowedProviderSafe()
 2012-10-04 17:14:45 -07:00
Victoria Lease
b1cc90c553 am 2646b3a4: Merge "Prevent overflow in LocationRequest.setExpireIn()" into jb-mr1-dev 
* commit '2646b3a46af3a24d54acffb1f956deeb6831d3ab':
  Prevent  overflow in LocationRequest.setExpireIn()
 2012-10-04 17:12:59 -07:00
Victoria Lease
dfc8e799ed Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev 2012-10-04 17:11:42 -07:00
Victoria Lease
2646b3a46a Merge "Prevent overflow in LocationRequest.setExpireIn()" into jb-mr1-dev 2012-10-04 17:10:22 -07:00
Christopher Tate
f86aeb6636 am dd2f15a5: Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev 
* commit 'dd2f15a563f18c9534cfa85fe2b8bf2fe100ed83':
  Make sure to check write perms after rewriting destination table
 2012-10-04 16:55:55 -07:00
Robert Greenwalt
0d1bd1911e am 7fd1386b: Merge "Properly cancel Tether notification." into jb-mr1-dev 
* commit '7fd1386b8a2b30669e0ffe0bacf17dd1feb5dba5':
  Properly cancel Tether notification.
 2012-10-04 16:53:25 -07:00
Christopher Tate
dd2f15a563 Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev 2012-10-04 16:52:46 -07:00
Victoria Lease
9c6816981f am a9afaccf: Merge "multiuser support for LocationBlacklist" into jb-mr1-dev 
* commit 'a9afaccf303da2b57a47ad16cca559e87e649d15':
  multiuser support for LocationBlacklist
 2012-10-04 16:51:43 -07:00
Robert Greenwalt
7fd1386b8a Merge "Properly cancel Tether notification." into jb-mr1-dev 2012-10-04 16:50:40 -07:00
Victoria Lease
a9afaccf30 Merge "multiuser support for LocationBlacklist" into jb-mr1-dev 2012-10-04 16:49:15 -07:00
Robert Greenwalt
3cab6b0f1d Properly cancel Tether notification. 
When we add a second type of tethering we unify the notifications
into a single generic type.  This is done by canceling the first
and replacing it, but this flow was improperly canceling, so
you could end up with orphaned tethering icons.

bug:7283605
Change-Id: I1d136f51592b4326d48578cf67b69122e45d4984
 2012-10-04 16:44:26 -07:00
Jeff Brown
93cbbb25a5 Allow phone to go to sleep while in call. 
Bug: 7279383
Change-Id: Ia05490218f40a1843507b95ff48fa07910e582d4
 2012-10-04 16:22:04 -07:00
Christopher Tate
34637e57fc Make sure to check write perms after rewriting destination table 
The write-permission check must occur after any destination-table
rewriting, otherwise any application would be able to write to
any global setting, by supplying a fraudulent "system" namespace
in the uri, but with a key name that will be redirected to global.

Bug 7289965

Change-Id: I122098a64e40d14e00d3cb6608c50aeb74faf7ce
 2012-10-04 16:01:10 -07:00
Jeff Brown
4fb5b85a5b am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev 
* commit 'dce8b948320e933e46e4a38c496f56555472495f':
  Fix parceling of display info flags.
 2012-10-04 15:27:15 -07:00
Adam Powell
64f369bbc5 am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev 
* commit 'b4fad85ca0ed258e4f8de8045c707a4bf2a6ce66':
  Fix regression in AbsListView CHOICE_MODE_SINGLE
 2012-10-04 15:25:36 -07:00
James Dong
68bf6eb411 am d6904819: Merge "Throw an exception instead of crash when a surface does not have a binding surface texture" into jb-mr1-dev 
* commit 'd6904819ab0d0ef896cdc129ca23e676dfcee57e':
  Throw an exception instead of crash when a surface does not have a binding surface texture
 2012-10-04 15:25:31 -07:00
Laurent Tu
941221c157 Handle other providers in isAllowedProviderSafe() 
Add a case for isAllowedProviderSafe() to handle providers that are not
GPS/Passive/Network/Fused. For example, this is useful for mock
providers.

Bug: 7047435
Change-Id: If4799aa90a5338889c47582d45cbfc25772c9c53
 2012-10-04 15:18:05 -07:00
Jeff Brown
dce8b94832 Merge "Fix parceling of display info flags." into jb-mr1-dev 2012-10-04 15:04:21 -07:00
Adam Powell
b4fad85ca0 Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev 2012-10-04 15:02:52 -07:00
James Dong
d6904819ab Merge "Throw an exception instead of crash when a surface does not have a binding surface texture" into jb-mr1-dev 2012-10-04 15:02:07 -07:00
Jeff Brown
3f2ba6220b Fix parceling of display info flags. 
Bug: 7283429
Change-Id: I5365a3b06d9b9f2414f9a9d2c94b0906c41b4ece
 2012-10-04 14:58:43 -07:00
Amith Yamasani
6474c4cd93 Fix dupes in initial wallpaper selection 
Bug: 7281217

Needed to load the settings for the user, in case the user was stopped.

Change-Id: I52d1f59a7681f8c4f7d3596486accb91cb840ecf
 2012-10-04 14:55:42 -07:00
Adam Powell
f3b8e6fe78 Fix regression in AbsListView CHOICE_MODE_SINGLE 
Earlier patch reversed a few lines of code that allowed deselection of
the currently selected item in CHOICE_MODE_SINGLE. Put it back the way
it was.

Bug 7289436

Change-Id: Ia1c5f3238d2faa3dd79e474851333fda90978d3c
 2012-10-04 14:53:36 -07:00
Justin Ho
05c6340359 am b2eb0282: Merge "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912" into jb-mr1-dev 
* commit 'b2eb0282ba1a7f95d93e6616783f339c7c9787e1':
  Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912
 2012-10-04 14:32:22 -07:00
Justin Ho
b2eb0282ba Merge "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912" into jb-mr1-dev 2012-10-04 14:29:35 -07:00
Laurent Tu
e72fe16146 Prevent overflow in LocationRequest.setExpireIn() 
Prevent overflow in LocationRequest.setExpireIn(), for example,
when we pass in Long.MAX_VALUE.

Bug: 7047435
Change-Id: Ie56928a59fb387173fbd3887c0ef9aede00f8152
 2012-10-04 13:40:08 -07:00
John Spurlock
26f44a1d12 am 3c008f26: Merge "Disable quick settings panel in setup wizard (user 0)." into jb-mr1-dev 
* commit '3c008f26ca4f72344b672065b861a3e39812e3a0':
  Disable quick settings panel in setup wizard (user 0).
 2012-10-04 13:15:55 -07:00
Joe Fernandez
8b1eae7f13 am 414561cf: am 7645936c: am ab1456ab: am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs 
* commit '414561cf843be7d83ad093885994236a1d036b93':
  docs: Remove Android Open Accessory docs, which are now on source.android.com
 2012-10-04 13:13:05 -07:00
John Spurlock
3c008f26ca Merge "Disable quick settings panel in setup wizard (user 0)." into jb-mr1-dev 2012-10-04 13:13:01 -07:00
Joe Fernandez
414561cf84 am 7645936c: am ab1456ab: am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs 
* commit '7645936c7b223ad865abdf22b79bdfac4cf39d98':
  docs: Remove Android Open Accessory docs, which are now on source.android.com
 2012-10-04 13:10:30 -07:00
Joe Fernandez
7645936c7b am ab1456ab: am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs 
* commit 'ab1456abad6094e527ab318294c20ec58453e4af':
  docs: Remove Android Open Accessory docs, which are now on source.android.com
 2012-10-04 13:08:27 -07:00
Joe Fernandez
ab1456abad am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs 
* commit 'e3eeeb6d03ed8575df5e8c8dfecd4e26af2d4127':
  docs: Remove Android Open Accessory docs, which are now on source.android.com
 2012-10-04 13:07:15 -07:00
Joe Fernandez
e3eeeb6d03 Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs 2012-10-04 13:05:12 -07:00
Scott Main
35c4dbc2d4 am 1cea533b: am a35333c1: am c465ae32: am 688447e5: fix the lesson title names 
* commit '1cea533b07ad6fdb2af9ed68edd75b968cbe2e72':
  fix the lesson title names
 2012-10-04 12:51:35 -07:00
Scott Main
1cea533b07 am a35333c1: am c465ae32: am 688447e5: fix the lesson title names 
* commit 'a35333c1719b312dd7c0d0a8591ee522f6f625e7':
  fix the lesson title names
 2012-10-04 12:50:05 -07:00
Scott Main
a35333c171 am c465ae32: am 688447e5: fix the lesson title names 
* commit 'c465ae324521fa1cb6e130f297fbb6da72a5072e':
  fix the lesson title names
 2012-10-04 12:47:59 -07:00
Scott Main
c465ae3245 am 688447e5: fix the lesson title names 
* commit '688447e512185dab4acd9ddfc9f22066d164ff4e':
  fix the lesson title names
 2012-10-04 12:45:29 -07:00
Dianne Hackborn
7df202e27a am 8a229195: Merge "Fix issue #6968859: home not exiting an ANR\'d dream" into jb-mr1-dev 
* commit '8a2291952528303d284878468fe260ec41998db3':
  Fix issue #6968859: home not exiting an ANR'd dream
 2012-10-04 12:43:15 -07:00
Daniel Sandler
501ddf14c9 am c30b6da8: Merge "Bring back the notification panel handle peek animation." into jb-mr1-dev 
* commit 'c30b6da804483e65eddda059e971727e1c80b7bf':
  Bring back the notification panel handle peek animation.
 2012-10-04 12:43:12 -07:00
Scott Main
688447e512 fix the lesson title names 
Change-Id: I09ba41685664b92b5082376a8b9e885bf444415f
 2012-10-04 12:43:05 -07:00
Dianne Hackborn
8a22919525 Merge "Fix issue #6968859: home not exiting an ANR'd dream" into jb-mr1-dev 2012-10-04 12:41:41 -07:00
Daniel Sandler
c30b6da804 Merge "Bring back the notification panel handle peek animation." into jb-mr1-dev 2012-10-04 12:41:41 -07:00
Elliott Hughes
1f7bddce79 am 3594e855: Merge "Fix Catalan ("ca") date formatting." into jb-mr1-dev 
* commit '3594e855a46fcfd9b9db62d6f6a39e6cbbe90794':
  Fix Catalan ("ca") date formatting.
 2012-10-04 12:40:32 -07:00
Elliott Hughes
3594e855a4 Merge "Fix Catalan ("ca") date formatting." into jb-mr1-dev 2012-10-04 12:38:24 -07:00
Daniel Sandler
0c1b75c17b Bring back the notification panel handle peek animation. 
Bug: 7286201
Change-Id: Id93d6a00689ffb7f97e89af935460b1debec3850
 2012-10-04 15:37:13 -04:00
Svetoslav Ganov
c37dc69ca2 am d367b70c: Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev 
* commit 'd367b70c4ad5d8e6cdbcc0d6d429428413cd39b3':
  Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END
 2012-10-04 12:32:38 -07:00