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

149595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
c7f9c059df am ee3266fd: Merge "Show lock to app request on all users" into lmp-dev 
* commit 'ee3266fd09b6ba69c14e4804c38895a166720bcd':
  Show lock to app request on all users
 2014-08-21 19:16:06 +00:00
Chris Craik
8f3acc3d93 am e5b5ad25: Merge "Fix layer shadow transform crash" into lmp-dev 
* commit 'e5b5ad251d56c66f28ab9333e9019bdc8cfc88e1':
  Fix layer shadow transform crash
 2014-08-21 19:15:57 +00:00
Jason Monk
1889c5c36d Merge "Show lock to app request on all users" into lmp-dev 2014-08-21 19:13:32 +00:00
Chris Craik
88180d269e Merge "Fix layer shadow transform crash" into lmp-dev 2014-08-21 19:03:25 +00:00
Nicolas Prevot
ae7a8453f4 am 38f817d8: Merge "In startActivityAsCaller, changing the way we get the userId." into lmp-dev 
* commit '38f817d8c5e3fd104988eec60453113a6b31ee03':
  In startActivityAsCaller, changing the way we get the userId.
 2014-08-21 18:53:26 +00:00
RoboErik
7247f17e20 am 36f8f711: Merge "Always set transport control flags" into lmp-dev 
* commit '36f8f711a494d88c2b649632861ce5d55e0ea8b8':
  Always set transport control flags
 2014-08-21 18:53:22 +00:00
Adam Lesinski
8207304c48 am 187df3fa: Merge "Update the Split example" into lmp-dev 
* commit '187df3fa17d3e39c1ef581733717ee45adf52c37':
  Update the Split example
 2014-08-21 18:53:16 +00:00
Nicolas Prevot
fffe00dfda Merge "In startActivityAsCaller, changing the way we get the userId." into lmp-dev 2014-08-21 18:47:38 +00:00
Adrian Roos
62919ef1cc am 7db2d800: Merge "Always put current user first in user switchers" into lmp-dev 
* commit '7db2d80046a8f5544d9c2e82a9ed534bae56ad49':
  Always put current user first in user switchers
 2014-08-21 18:45:44 +00:00
RoboErik
7a346dfdd7 Merge "Always set transport control flags" into lmp-dev 2014-08-21 18:44:26 +00:00
Adam Lesinski
f01c2149a0 Merge "Update the Split example" into lmp-dev 2014-08-21 18:43:58 +00:00
Adam Lesinski
49e2fa5c5e Update the Split example 
Caveat: There are two bugs:

- Mipmap definitions get placed in all splits.
- mdpi drawable doesn't get split properly.

Change-Id: I53b8e54cbcb3dfba495ec68e602f98666e8883a7
 2014-08-21 11:38:49 -07:00
Adrian Roos
aa6e09e7c7 Merge "Always put current user first in user switchers" into lmp-dev 2014-08-21 18:36:03 +00:00
Svet Ganov
296475b63e am 15c39597: Merge "Fix a regression in partially updading app widgets." into lmp-dev 
* commit '15c395971449c1d5c4dd03b883979a7e99234a31':
  Fix a regression in partially updading app widgets.
 2014-08-21 18:32:31 +00:00
Adam Lesinski
e50c8fbddd am 3a0a53a9: Merge "Use the correct versionCode for Split APKs" into lmp-dev 
* commit '3a0a53a9348af48566409766e7d7f5ef01608506':
  Use the correct versionCode for Split APKs
 2014-08-21 18:32:26 +00:00
Adrian Roos
bed6e3bedc Always put current user first in user switchers 
Bug: 16896343
Change-Id: I2de19b3af5d5b2eed1347b41bccf9c9dc87c2e5b
 2014-08-21 20:31:41 +02:00
Svet Ganov
caab40dfef Merge "Fix a regression in partially updading app widgets." into lmp-dev 2014-08-21 18:27:11 +00:00
Adam Lesinski
ceb334272f Merge "Use the correct versionCode for Split APKs" into lmp-dev 2014-08-21 18:21:20 +00:00
Andre Eisenbach
f7df2ad368 am e2f5c5c4: Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev 
* commit 'e2f5c5c4b0927f051f815cfde1a7a0fb57c652cc':
  LE: Rename new MTU and connection paramter update APIs
 2014-08-21 18:04:40 +00:00
Adam Lesinski
6a7d2757a9 Use the correct versionCode for Split APKs 
Insert the correct versionCode into the generated
Split AndroidManifest.xml.

Change-Id: I0aec797b5a4ff8bd70f9394b18aee5ad292b37c8
 2014-08-21 11:00:09 -07:00
Andre Eisenbach
491cb3f578 Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev 2014-08-21 17:56:25 +00:00
Ricardo Cervera
a3743ecf53 am aa552be4: am c1da9cbf: am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 
* commit 'aa552be489d46b7da2794e4e6735f929dd9cd463':
  docs: Fixed typo in intents page. Bug: 16949177
 2014-08-21 17:52:39 +00:00
Rich Slogar
5c8f62abf1 am 0aab43f5: am e415ebc6: am d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs 
* commit '0aab43f57a9015f1350a7883b888023f432fb408':
  Docs: Fixed typo 'Fore'
 2014-08-21 17:52:35 +00:00
RoboErik
6c30ff976d Always set transport control flags 
In case we're attaching to a pre-existing session with non-zero flags.

bug:16822064
Change-Id: Ibd5cc8e00de59f1fe30fc3d0e64741aaf9f4746f
 2014-08-21 17:52:31 +00:00
Ricardo Cervera
ef05c2740a am abf5dcdd: am e4be8986: am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs 
* commit 'abf5dcdd36145424a164a83fd7095d617a8cd491':
  docs: Fixed bug in declaring layout page. Bug: 16815916
 2014-08-21 17:52:30 +00:00
Ricardo Cervera
2448f009c7 am d6323df5: am 9e6b3e7d: am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202 
* commit 'd6323df55f78dad10a562c0508e89154827fd625':
  docs: Fixed typo in Wear training class. Bug: 16709202
 2014-08-21 17:52:15 +00:00
Jeff Sharkey
3fddb7e3c8 am fd65582d: Merge "Clear identity before calling out to PackageHelper" into lmp-dev 
* commit 'fd65582d678d9901df629d5e44eeae1c0c875e2b':
  Clear identity before calling out to PackageHelper
 2014-08-21 17:52:10 +00:00
Jason Monk
63f29d9d7c Show lock to app request on all users 
This way secondary users can see it.  To avoid it being displayed
on the wrong user, clear it on user switch.

Bug: 17151184
Change-Id: I1699f85d2d90cbc0e17f39f9971f20d90637b38f
 2014-08-21 13:45:44 -04:00
Ricardo Cervera
e5d7411744 am c1da9cbf: am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 
* commit 'c1da9cbff5d5b597fd58cbb578a1eadc6f479c80':
  docs: Fixed typo in intents page. Bug: 16949177
 2014-08-21 17:44:53 +00:00
Rich Slogar
a0256562c8 am e415ebc6: am d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs 
* commit 'e415ebc634c98b5a6aaa42c0698b7482e44b3b3f':
  Docs: Fixed typo 'Fore'
 2014-08-21 17:44:47 +00:00
Ricardo Cervera
866ae385dd am e4be8986: am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs 
* commit 'e4be8986544a45a2560003f004b72528c691acef':
  docs: Fixed bug in declaring layout page. Bug: 16815916
 2014-08-21 17:44:40 +00:00
Ricardo Cervera
005d4ecaaf am 9e6b3e7d: am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202 
* commit '9e6b3e7dd85224c836e902551079c2445688d762':
  docs: Fixed typo in Wear training class. Bug: 16709202
 2014-08-21 17:44:27 +00:00
Jeff Sharkey
a0b805715a Merge "Clear identity before calling out to PackageHelper" into lmp-dev 2014-08-21 17:42:02 +00:00
Adam Lesinski
c406bde7a1 am fcb42104: Merge "AAPT: Fix regression generating dynamic ref table for shared libraries" into lmp-dev 
* commit 'fcb421041f01318f31df7a3574f3757d7caf63ef':
  AAPT: Fix regression generating dynamic ref table for shared libraries
 2014-08-21 17:40:23 +00:00
Robin Lee
e812d90969 Clear identity before calling out to PackageHelper 
PackageHelper.resolveInstallLocation expects the binding user to be
equivalent to the calling user. If this is not the case, it may fail
and throw an exception preventing anyone but user 0 from installing
anything.

Bug: 17175251
Change-Id: Id5615738c7b4e1234a548c7b4a410282d14c9ee3
 2014-08-21 17:37:20 +00:00
Adam Lesinski
223ddaa74d Merge "AAPT: Fix regression generating dynamic ref table for shared libraries" into lmp-dev 2014-08-21 17:31:46 +00:00
Ricardo Cervera
c1da9cbff5 am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 
* commit '2c374e643d6cce73a71fb57559f898b6b554e36c':
  docs: Fixed typo in intents page. Bug: 16949177
 2014-08-21 17:31:31 +00:00
Rich Slogar
e415ebc634 am d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs 
* commit 'd309de3d06817e51aab056284874f613238ff400':
  Docs: Fixed typo 'Fore'
 2014-08-21 17:31:27 +00:00
Ricardo Cervera
e4be898654 am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs 
* commit '0d65bf25c8a9091d598f50e0d534625107db6cf6':
  docs: Fixed bug in declaring layout page. Bug: 16815916
 2014-08-21 17:31:03 +00:00
Ricardo Cervera
9e6b3e7dd8 am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202 
* commit '63da186fef8add43bcd0c347eec86946b67350c3':
  docs: Fixed typo in Wear training class. Bug: 16709202
 2014-08-21 17:30:57 +00:00
Winson Chung
6e377516f0 am d0f79c5c: Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev 
* commit 'd0f79c5cef9d88e7c4273d4b96761c9871112260':
  Fixing issue with inconsistent icon filename. (Bug 16992882)
 2014-08-21 17:27:20 +00:00
Winson Chung
b91bd653c9 Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev 2014-08-21 17:19:28 +00:00
Chris Craik
c71bfcaa18 Fix layer shadow transform crash 
bug:17180252

Change-Id: Ia648b8c98a217a3a4973917bf255d1397802cbbe
 2014-08-21 10:18:59 -07:00
Andres Morales
b6acdfa283 am 87eeebec: Merge "Remove old NFC unlock api" into lmp-dev 
* commit '87eeebec63b132b62920201b60ec56ca4e8ac6b3':
  Remove old NFC unlock api
 2014-08-21 17:18:13 +00:00
Paul Jensen
6251784931 am 4a5d418d: Merge "Send captive portal broadcast as user CURRENT." into lmp-dev 
* commit '4a5d418db29a3917f084e9b3da786c82510535f3':
  Send captive portal broadcast as user CURRENT.
 2014-08-21 17:18:08 +00:00
Andres Morales
6a12e77194 Merge "Remove old NFC unlock api" into lmp-dev 2014-08-21 17:07:32 +00:00
Paul Jensen
e16a24559f Merge "Send captive portal broadcast as user CURRENT." into lmp-dev 2014-08-21 17:05:42 +00:00
RoboErik
abb19a71fd am 90863124: Merge "Set transport control flags when a session is created" into lmp-dev 
* commit '908631240c31ef482f7e9189822e803da1b22030':
  Set transport control flags when a session is created
 2014-08-21 17:05:04 +00:00
Dianne Hackborn
6f334b8964 am ee6e179e: Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 
* commit 'ee6e179e85c029573948830f37bbbddfea1e78a5':
  Fix issue #17038762: Add API to add entries to the recents list
 2014-08-21 17:04:52 +00:00
RoboErik
69b131339b Merge "Set transport control flags when a session is created" into lmp-dev 2014-08-21 16:58:42 +00:00