Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,681 Commits 3 Branches 0 Tags
6cb4be0aa6e28ea053cb346209644d2dabceea2f
Commit Graph

90681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Satoshi Kataoka
6cb4be0aa6 am 42802338: am 0f300c70: am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 
* commit '4280233813c22663d3e9d100cac70eaccd0d2afc':
  Support multi-user switch in TextServicesManagerService
 2012-10-04 18:08:32 -07:00
Adam Powell
3c565acd99 am 7eff1d28: am 123436eb: am 2ee1f656: Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev 
* commit '7eff1d28e23e546d456f21755155158e74c93711':
  MediaRouter/Wireless Display - correct initial state
 2012-10-04 18:06:52 -07:00
Satoshi Kataoka
4280233813 am 0f300c70: am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 
* commit '0f300c7045f150722532fd50dd78f6fcb4c4f395':
  Support multi-user switch in TextServicesManagerService
 2012-10-04 18:05:45 -07:00
Adam Powell
7eff1d28e2 am 123436eb: am 2ee1f656: Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev 
* commit '123436ebd5adc528c23e378bd552d9548a8a27ad':
  MediaRouter/Wireless Display - correct initial state
 2012-10-04 18:03:58 -07:00
Satoshi Kataoka
0f300c7045 am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 
* commit '284b20538764afe2500be6ba5b1f3a057123ffc9':
  Support multi-user switch in TextServicesManagerService
 2012-10-04 18:03:33 -07:00
Adam Powell
123436ebd5 am 2ee1f656: Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev 
* commit '2ee1f6567d2bc25c58f212354ffd09df18fc0b25':
  MediaRouter/Wireless Display - correct initial state
 2012-10-04 18:01:52 -07:00
Satoshi Kataoka
284b205387 Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 2012-10-04 18:01:09 -07:00
Adam Powell
2ee1f6567d Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev 2012-10-04 18:00:01 -07:00
Jeff Brown
7952056c71 am b1e93505: am 25f5a71f: am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit 'b1e93505ae479c657fd2cfc21ddabadec8a03f6a':
  Allow phone to go to sleep while in call.
 2012-10-04 17:39:07 -07:00
Jeff Brown
b1e93505ae am 25f5a71f: am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit '25f5a71f31d8cb526f04c833c5b67e59369c725f':
  Allow phone to go to sleep while in call.
 2012-10-04 17:37:29 -07:00
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
Amith Yamasani
af0e7e878f am 9893c47d: am 344e019a: am 82245c19: Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 
* commit '9893c47d331fd9dd92d845b6f1a3202cc4ed503b':
  Fix dupes in initial wallpaper selection
 2012-10-04 17:34:16 -07:00
Amith Yamasani
9893c47d33 am 344e019a: am 82245c19: Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 
* commit '344e019ace59cee49bce2e7b522ecba8e3b8f1c0':
  Fix dupes in initial wallpaper selection
 2012-10-04 17:32:48 -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
e44d6855db am 768ad29b: am fddea604: am dfc8e799: Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev 
* commit '768ad29b9dd120d30ae0b28e2ad30ba3006dea3c':
  Handle other providers in isAllowedProviderSafe()
 2012-10-04 17:20:18 -07:00
Victoria Lease
cef918dee0 am 9c2ce5a6: am b1cc90c5: am 2646b3a4: Merge "Prevent overflow in LocationRequest.setExpireIn()" into jb-mr1-dev 
* commit '9c2ce5a675b6453f94658776c65402ee948476da':
  Prevent  overflow in LocationRequest.setExpireIn()
 2012-10-04 17:18:38 -07:00
Victoria Lease
768ad29b9d am fddea604: am dfc8e799: Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev 
* commit 'fddea6042eddf6c54d30fd313f9f317f6b33ef5e':
  Handle other providers in isAllowedProviderSafe()
 2012-10-04 17:17:34 -07:00
Victoria Lease
9c2ce5a675 am b1cc90c5: am 2646b3a4: Merge "Prevent overflow in LocationRequest.setExpireIn()" into jb-mr1-dev 
* commit 'b1cc90c553a7aaf029a84249bb9578c7d88fd53b':
  Prevent  overflow in LocationRequest.setExpireIn()
 2012-10-04 17:15:35 -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
201809eea6 am 6d5cd6cb: am f86aeb66: am dd2f15a5: Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev 
* commit '6d5cd6cb56c0317247ebd597b2622bfeb581bcaf':
  Make sure to check write perms after rewriting destination table
 2012-10-04 17:00:28 -07:00
Robert Greenwalt
b51dd7b3cd am ca6a2c34: am 0d1bd191: am 7fd1386b: Merge "Properly cancel Tether notification." into jb-mr1-dev 
* commit 'ca6a2c34538a8691d259bdc935c611bda7407532':
  Properly cancel Tether notification.
 2012-10-04 16:58:39 -07:00
Christopher Tate
6d5cd6cb56 am f86aeb66: am dd2f15a5: Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev 
* commit 'f86aeb66360bc825090c18851ffb8d89baa000bf':
  Make sure to check write perms after rewriting destination table
 2012-10-04 16:57:50 -07:00
Victoria Lease
cd6cee171b am 50d849ed: am 9c681698: am a9afaccf: Merge "multiuser support for LocationBlacklist" into jb-mr1-dev 
* commit '50d849ed8970977e2bb65fdd482f9be2a4af8491':
  multiuser support for LocationBlacklist
 2012-10-04 16:57:00 -07:00
Robert Greenwalt
ca6a2c3453 am 0d1bd191: am 7fd1386b: Merge "Properly cancel Tether notification." into jb-mr1-dev 
* commit '0d1bd1911e3fe470a4da5fd82ba602c6c3cc8944':
  Properly cancel Tether notification.
 2012-10-04 16:56:06 -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
Victoria Lease
50d849ed89 am 9c681698: am a9afaccf: Merge "multiuser support for LocationBlacklist" into jb-mr1-dev 
* commit '9c6816981f9b4919e97dc3e5489efd7d94e9a33a':
  multiuser support for LocationBlacklist
 2012-10-04 16:54:22 -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
Adam Powell
11b999d0aa MediaRouter/Wireless Display - correct initial state 
Make sure we get the right initial status for wifi displays when a new
display route is first added to the MediaRouter.

Bug 7289746

Change-Id: Id41f704fc88021bd4cdf21e9f4b3c810775e1aea
 2012-10-04 16:28:53 -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
2e65fa2cc3 am 6ac19fe0: am 4fb5b85a: am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev 
* commit '6ac19fe0b02c05089e53e380a980b4f646739b30':
  Fix parceling of display info flags.
 2012-10-04 15:33:35 -07:00
Jeff Brown
6ac19fe0b0 am 4fb5b85a: am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev 
* commit '4fb5b85a5be88028398e67f37b2d7f802550d9fd':
  Fix parceling of display info flags.
 2012-10-04 15:31:07 -07:00
Adam Powell
0a027ded5f am 5e1b345f: am 64f369bb: am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev 
* commit '5e1b345f41a01e46e2bddf53e3b0c73b3877333c':
  Fix regression in AbsListView CHOICE_MODE_SINGLE
 2012-10-04 15:30:16 -07:00
James Dong
b6fdd9be7a am f4e2d378: am 68bf6eb4: am d6904819: Merge "Throw an exception instead of crash when a surface does not have a binding surface texture" into jb-mr1-dev 
* commit 'f4e2d378a7ba12fff732815b42e052cbb1a63a22':
  Throw an exception instead of crash when a surface does not have a binding surface texture
 2012-10-04 15:30:12 -07:00
Adam Powell
5e1b345f41 am 64f369bb: am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev 
* commit '64f369bbc55a1ca9a88db298dff34fba38c1daae':
  Fix regression in AbsListView CHOICE_MODE_SINGLE
 2012-10-04 15:27:47 -07:00
James Dong
f4e2d378a7 am 68bf6eb4: am d6904819: Merge "Throw an exception instead of crash when a surface does not have a binding surface texture" into jb-mr1-dev 
* commit '68bf6eb411afff2f3233ce7447914b34af6b1b96':
  Throw an exception instead of crash when a surface does not have a binding surface texture
 2012-10-04 15:27:44 -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