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

151670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ztenghui
7e313bb933 am 624b50cf: am 07856605: Merge "VD: Update the fillColor default as transparent" into lmp-dev 
* commit '624b50cf4da5a5c33dded850dc4756576e8c1084':
  VD: Update the fillColor default as transparent
 2014-08-26 18:31:26 +00:00
Georgi Nikolov
97f3d7e093 am 6f7beb16: am 172d3b87: Merge "Add maximum time-out to sync operation" into lmp-dev 
* commit '6f7beb160567d261f3b4da285d2f5bbfd2b43919':
  Add maximum time-out to sync operation
 2014-08-26 18:31:22 +00:00
Georgi Nikolov
be8dad1c63 am ee461b92: am 67a86862: Merge "Don\'t back-off ALREADY_IN_PROGRESS syncs" into lmp-dev 
* commit 'ee461b92a20137c05bc7065a71d188b2e80b69df':
  Don't back-off ALREADY_IN_PROGRESS syncs
 2014-08-26 18:31:17 +00:00
ztenghui
eaa532425c am 07856605: Merge "VD: Update the fillColor default as transparent" into lmp-dev 
* commit '07856605a8001697ff50371b39ecd0cd4480fd57':
  VD: Update the fillColor default as transparent
 2014-08-26 18:24:43 +00:00
Georgi Nikolov
cc6a91e0c7 am 172d3b87: Merge "Add maximum time-out to sync operation" into lmp-dev 
* commit '172d3b876310b20bc5b627a344ea51148dc39c7b':
  Add maximum time-out to sync operation
 2014-08-26 18:19:05 +00:00
Georgi Nikolov
015dcf6573 am 67a86862: Merge "Don\'t back-off ALREADY_IN_PROGRESS syncs" into lmp-dev 
* commit '67a8686203779cdfb158a41fda28290dd6134154':
  Don't back-off ALREADY_IN_PROGRESS syncs
 2014-08-26 18:18:58 +00:00
ztenghui
ae82e604fa Merge "VD: Update the fillColor default as transparent" into lmp-dev 2014-08-26 18:18:16 +00:00
Georgi Nikolov
ffc596bd22 Merge "Add maximum time-out to sync operation" into lmp-dev 2014-08-26 18:16:54 +00:00
Georgi Nikolov
1877924da0 Merge "Don't back-off ALREADY_IN_PROGRESS syncs" into lmp-dev 2014-08-26 18:13:14 +00:00
Craig Mautner
b089c41533 am 3750a055: am 7018ec68: Merge "Remove redundant call to window manager addTask()" into lmp-dev 
* commit '3750a055b5f29b0d9bfe364672e28c9ac7aa86c2':
  Remove redundant call to window manager addTask()
 2014-08-26 17:52:17 +00:00
Craig Mautner
ca0e070fea am 7018ec68: Merge "Remove redundant call to window manager addTask()" into lmp-dev 
* commit '7018ec68207e0a009b9410a09027a2823a29dd3d':
  Remove redundant call to window manager addTask()
 2014-08-26 17:38:54 +00:00
Christoph Studer
e76edacf32 am f1b13aee: am 1fe25a6f: Merge "SysUI: Force L+ status bar icons to white" into lmp-dev 
* commit 'f1b13aeeb19d4b5a891d74dc0d7501944228e775':
  SysUI: Force L+ status bar icons to white
 2014-08-26 17:34:02 +00:00
Craig Mautner
e7b1a0b68c Merge "Remove redundant call to window manager addTask()" into lmp-dev 2014-08-26 17:29:17 +00:00
Adam Lesinski
6d41a45679 am 1d3ecf16: am 1c959e92: Merge "Introduce anydpi density resource qualifier" into lmp-dev 
* commit '1d3ecf16766d92ef3d847f1420b9a622e871f6cd':
  Introduce anydpi density resource qualifier
 2014-08-26 17:23:35 +00:00
Christoph Studer
76f0509306 am 1fe25a6f: Merge "SysUI: Force L+ status bar icons to white" into lmp-dev 
* commit '1fe25a6f041edc7518a4c6f29ac830c64e4a6e61':
  SysUI: Force L+ status bar icons to white
 2014-08-26 17:23:21 +00:00
Adam Lesinski
31341665d6 am 1c959e92: Merge "Introduce anydpi density resource qualifier" into lmp-dev 
* commit '1c959e9240d82ab80c7f921dc1af67acc9958b91':
  Introduce anydpi density resource qualifier
 2014-08-26 17:14:55 +00:00
Christoph Studer
38db384424 Merge "SysUI: Force L+ status bar icons to white" into lmp-dev 2014-08-26 17:13:39 +00:00
Adam Lesinski
d691f31e51 Merge "Introduce anydpi density resource qualifier" into lmp-dev 2014-08-26 17:03:44 +00:00
Mohamad Ayyash
a6bf005a3e am f53f8d5d: am aaf5d6c0: Merge "Set text color for the output log." into lmp-dev 
* commit 'f53f8d5d29acabf51c19f55de2ca3e1aab4949de':
  Set text color for the output log.
 2014-08-26 17:02:10 +00:00
Vinod Krishnan
f5f502b2db am 13f71ede: am dfde8600: Merge "Fwk: Adding an ECG hardware feature" into lmp-dev 
* commit '13f71edefa81364525c78b1c02993f5366c9da30':
  Fwk: Adding an ECG hardware feature
 2014-08-26 17:02:04 +00:00
Christoph Studer
13b895125c SysUI: Force L+ status bar icons to white 
Bug: 16862480
Change-Id: I13126e4641563953d00b8e1b8324b470b9fc085c
 2014-08-26 18:51:36 +02:00
Mohamad Ayyash
b7da699afa am aaf5d6c0: Merge "Set text color for the output log." into lmp-dev 
* commit 'aaf5d6c09460466a33544fc9107cda69085c4ce5':
  Set text color for the output log.
 2014-08-26 16:47:47 +00:00
Nicolas Prevot
d11ff724fd am f7fd8a87: am 5638d3a6: Merge "Marking the Settings ContentProvider as singleUser" into lmp-dev 
* commit 'f7fd8a874d3644ad7b88e214b46517ee62be35c9':
  Marking the Settings ContentProvider as singleUser
 2014-08-26 16:47:47 +00:00
Vinod Krishnan
5449b8dbed am dfde8600: Merge "Fwk: Adding an ECG hardware feature" into lmp-dev 
* commit 'dfde8600c0f0ff9349f971ed52bfbe9c0c02bc08':
  Fwk: Adding an ECG hardware feature
 2014-08-26 16:47:38 +00:00
Mohamad Ayyash
412e4e203f Merge "Set text color for the output log." into lmp-dev 2014-08-26 16:44:28 +00:00
Nicolas Prevot
49cf67596f am 5638d3a6: Merge "Marking the Settings ContentProvider as singleUser" into lmp-dev 
* commit '5638d3a661f3b4cbda01e23c7b8a0a3eb9f6e107':
  Marking the Settings ContentProvider as singleUser
 2014-08-26 16:39:18 +00:00
Vinod Krishnan
51f6f52d9d Merge "Fwk: Adding an ECG hardware feature" into lmp-dev 2014-08-26 16:37:33 +00:00
Nicolas Prevot
1ce1ba68ac Merge "Marking the Settings ContentProvider as singleUser" into lmp-dev 2014-08-26 16:29:20 +00:00
Esteban Talavera
1a4b59960b am 4835644c: am 14dcf0ff: Merge "Revert API constants to previous value to match hardcoded value in google3 apps" into lmp-dev 
* commit '4835644c3bff5b0906789a746a14b6b24f3d375f':
  Revert API constants to previous value to match hardcoded value in google3 apps
 2014-08-26 16:17:40 +00:00
Esteban Talavera
a502af4ea0 am 14dcf0ff: Merge "Revert API constants to previous value to match hardcoded value in google3 apps" into lmp-dev 
* commit '14dcf0ff149a4253f867e9622e8a8bc8ffce52b4':
  Revert API constants to previous value to match hardcoded value in google3 apps
 2014-08-26 16:08:09 +00:00
Esteban Talavera
75b3fafe9e Merge "Revert API constants to previous value to match hardcoded value in google3 apps" into lmp-dev 2014-08-26 15:58:36 +00:00
John Reck
7dd9776fa8 am d73a1aa3: am fec7508b: Merge "DO NOT MERGE Copy shaders" into lmp-dev 
* commit 'd73a1aa3b97d9cd9792dec4a58ab6150b76afb31':
  DO NOT MERGE Copy shaders
 2014-08-26 15:13:50 +00:00
John Reck
b1d0ef5356 am fec7508b: Merge "DO NOT MERGE Copy shaders" into lmp-dev 
* commit 'fec7508b79566bdbd194a1a33a742f510a02f1a9':
  DO NOT MERGE Copy shaders
 2014-08-26 15:00:49 +00:00
Youngsang Cho
2ab2c3935c am ff0f038a: am 5a2d4677: Merge "Reset a session callback variable when tune is failed" into lmp-dev 
* commit 'ff0f038a78233994a2966a174b643f4238985f3d':
  Reset a session callback variable when tune is failed
 2014-08-26 14:55:56 +00:00
John Reck
1698297daf Merge "DO NOT MERGE Copy shaders" into lmp-dev 2014-08-26 14:53:34 +00:00
Jorim Jaggi
e680fcaab2 am cb6f8ac1: am 5ef697cb: Merge "Fix invalid keyguard state after pressing back in bouncer" into lmp-dev 
* commit 'cb6f8ac181fd75ff4e78326034a316f56efbc853':
  Fix invalid keyguard state after pressing back in bouncer
 2014-08-26 14:46:25 +00:00
Youngsang Cho
a9f514016b am 5a2d4677: Merge "Reset a session callback variable when tune is failed" into lmp-dev 
* commit '5a2d4677a739947b03a1e4261bec2456d9820330':
  Reset a session callback variable when tune is failed
 2014-08-26 14:46:21 +00:00
Nicolas Prevot
c52c0346d5 am 4df5251c: am a309e38c: Merge "Preventing apps from granting uris to any other user." into lmp-dev 
* commit '4df5251c567788569ec0da5df33def918bcab48f':
  Preventing apps from granting uris to any other user.
 2014-08-26 14:46:19 +00:00
Youngsang Cho
c931cc0850 Merge "Reset a session callback variable when tune is failed" into lmp-dev 2014-08-26 14:40:03 +00:00
Esteban Talavera
fbb28dfb95 Revert API constants to previous value to match hardcoded value in google3 apps 
Revert value of DevicePolicyManager constants that were hardcoded in dmagent. See previous change I6f60a43fe23526cfe855d81015feb759cf643926.

Bug: 17275391,17005622
Change-Id: I606b010eb0399f7b34b59c99f96549949410bafc
 2014-08-26 15:38:44 +01:00
Youngsang Cho
7cf6705455 Reset a session callback variable when tune is failed 
Change-Id: I7c0188d916047f8331c74ce7a29b0a5228583979
 2014-08-26 23:12:59 +09:00
Jorim Jaggi
ef7f2b46bd am 5ef697cb: Merge "Fix invalid keyguard state after pressing back in bouncer" into lmp-dev 
* commit '5ef697cb1e3400cc2d426326a728482b33fe83ff':
  Fix invalid keyguard state after pressing back in bouncer
 2014-08-26 14:05:18 +00:00
Jorim Jaggi
359404c786 Merge "Fix invalid keyguard state after pressing back in bouncer" into lmp-dev 2014-08-26 13:57:25 +00:00
Nicolas Prevot
c11879a6d5 am a309e38c: Merge "Preventing apps from granting uris to any other user." into lmp-dev 
* commit 'a309e38c34176a2b292e761a45fc14b914b7d9ff':
  Preventing apps from granting uris to any other user.
 2014-08-26 13:51:01 +00:00
Nicolas Prevot
fb9cf2309d Merge "Preventing apps from granting uris to any other user." into lmp-dev 2014-08-26 13:42:27 +00:00
Jorim Jaggi
cb88c7be4a am 21a8b98a: am c474c52c: Merge "Always allow translucent bars for keyguard" into lmp-dev 
* commit '21a8b98a07485e99417f9e36d213dd0812a7e5de':
  Always allow translucent bars for keyguard
 2014-08-26 13:30:58 +00:00
Jorim Jaggi
6bad244c4e Fix invalid keyguard state after pressing back in bouncer 
Bug: 16886960
Change-Id: Ib071b302f9cb2f1fec32285e05a5b8585e53e41e
 2014-08-26 15:24:01 +02:00
Jorim Jaggi
6110361f42 am c474c52c: Merge "Always allow translucent bars for keyguard" into lmp-dev 
* commit 'c474c52c3dba39af9fa54235a469c80a2421f2d0':
  Always allow translucent bars for keyguard
 2014-08-26 13:21:57 +00:00
Chulwoo Lee
66e10574cb am 8ddae2f5: am 42bbfe62: Recreate overlay view after the TIS crashes 
* commit '8ddae2f50d910f26a6ff87d2de636a42d848653f':
  Recreate overlay view after the TIS crashes
 2014-08-26 13:19:43 +00:00
Nicolas Prevot
83bb610fad Preventing apps from granting uris to any other user. 
And adding some javadoc.

BUG: 16996334

Change-Id: I02b03e513050e2704c28da8e17c2c977d858627b
 2014-08-26 14:16:00 +01:00