ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
51,386 Commits 2 Branches 0 Tags 54 MiB
236e790608
Commit Graph

51386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
7fe8b2b7d6 merge in lmp-mr1-release history after reset to 71e351d96b 2014-09-28 06:10:26 -07:00
The Android Automerger
6a0a0fe0f7 merge in lmp-mr1-release history after reset to 71e351d96b 2014-09-27 06:11:32 -07:00
Aravind Akella
b17044adcf am 71e351d9: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev 
* commit '71e351d96b551ccdbc39b52a0c66da86cae83701':
  Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper  when the connection is removed from mActiveConnections."
 2014-09-27 06:17:21 +00:00
Aravind Akella
bea1db57de am 71e351d9: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev 
* commit '71e351d96b551ccdbc39b52a0c66da86cae83701':
  Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper  when the connection is removed from mActiveConnections."
 2014-09-27 02:46:32 +00:00
Aravind Akella
71e351d96b Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev 2014-09-27 02:09:30 +00:00
Aravind Akella
678f4fce90 Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections." 
This reverts commit 5105960d49.

Change-Id: I4d39ded2e50ef8a8e0aac27e438876203385a1f0
 2014-09-27 02:06:32 +00:00
Michael Wright
2344006b6e am 4b20d402: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev 
* commit '4b20d40218a25adcad21cc135a3103b4e04940f3':
  Only mark repeated keys as PASS_TO_USER if the original key was.
 2014-09-26 05:10:08 +00:00
Jesse Hall
53e6b95d05 am 728a8da1: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev 
* commit '728a8da14638e718ede11a7a894705524fc9d171':
  surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
 2014-09-26 05:10:07 +00:00
Michael Wright
cfbc36544e am 4b20d402: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev 
* commit '4b20d40218a25adcad21cc135a3103b4e04940f3':
  Only mark repeated keys as PASS_TO_USER if the original key was.
 2014-09-26 01:47:01 +00:00
Jesse Hall
1b5c8839f7 am 728a8da1: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev 
* commit '728a8da14638e718ede11a7a894705524fc9d171':
  surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
 2014-09-26 01:47:00 +00:00
Michael Wright
4b20d40218 Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev 2014-09-26 01:38:57 +00:00
Michael Wright
2e732956ad Only mark repeated keys as PASS_TO_USER if the original key was. 
Bug: 17629695
Change-Id: Ic569aba4149c6cc321c2cf8aede7c5e8a1196234
 2014-09-25 13:20:20 -07:00
The Android Automerger
1635df88c4 merge in lmp-mr1-release history after reset to 5105960d49 2014-09-25 06:13:48 -07:00
Jesse Hall
728a8da146 Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev 2014-09-24 22:07:01 +00:00
The Android Automerger
e02b69cfad merge in lmp-mr1-release history after reset to 5105960d49 2014-09-24 06:13:22 -07:00
Aravind Akella
8f12365b76 am 5105960d: Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections. 
* commit '5105960d49bfa86efeeea8f87c87aa96b5771c37':
  Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
 2014-09-24 04:24:07 +00:00
Aravind Akella
8b4869dc83 am 5105960d: Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections. 
* commit '5105960d49bfa86efeeea8f87c87aa96b5771c37':
  Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
 2014-09-24 03:48:09 +00:00
chenhg
0ea1cb9195 surfaceflinger: Check sideband stream changed to trigger sideband Layer update. 
BUG: 17382907
Change-Id: I65fd037bd25238ae68a3976468ae7fd7ce49c562
 2014-09-23 17:26:00 -07:00
Aravind Akella
5105960d49 Fix sockfd leakage in SensorService. Remove sockfd from Looper 
when the connection is removed from mActiveConnections.

Bug: 17472228
Change-Id: Iaabe0968bd2104ef961ff5e8659bf91712e2e1db
 2014-09-23 23:46:22 +00:00
The Android Automerger
8c9f7cce8b merge in lmp-mr1-release history after reset to 12c4bdad7b 2014-09-23 15:15:26 -07:00
Michael Lentine
14fa402fea am 12c4bdad: Add rate-limited logging for unimplemented es functions. 
* commit '12c4bdad7b2372ab64dcd2abbdbe47e709fb8b90':
  Add rate-limited logging for unimplemented es functions.
 2014-09-23 19:41:45 +00:00
Michael Lentine
53bffaaf27 am 12c4bdad: Add rate-limited logging for unimplemented es functions. 
* commit '12c4bdad7b2372ab64dcd2abbdbe47e709fb8b90':
  Add rate-limited logging for unimplemented es functions.
 2014-09-23 19:16:54 +00:00
Dan Albert
56b3f887a2 am 6ee97e74: Merge "Fix a null dereference." 
* commit '6ee97e74d2c972dec2aa6a2f231b718eae54898f':
  Fix a null dereference.
 2014-09-23 17:54:39 +00:00
Dan Albert
265f0d9dff am 6ee97e74: Merge "Fix a null dereference." 
* commit '6ee97e74d2c972dec2aa6a2f231b718eae54898f':
  Fix a null dereference.
 2014-09-23 17:53:39 +00:00
Dan Albert
6ee97e74d2 Merge "Fix a null dereference." 2014-09-23 17:41:11 +00:00
Dan Albert
c78a0c1733 Fix a null dereference. 
Change-Id: I7224c3368ff414620062bc08b80a6a94d55d7931
 2014-09-23 09:51:51 -07:00
Lorenzo Colitti
63a8e04d2d am d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev 
* commit 'd94854030c76fc4ee4126ca1707a76fbd1f29126':
  Include the VPN server IP address in the VPN state file.
 2014-09-23 15:50:59 +00:00
Michael Lentine
12c4bdad7b Add rate-limited logging for unimplemented es functions. 
Bug: 17322013

Change-Id: I7aa5ab2f76cf344cfb75802edbfd44e8e7526ff1
 2014-09-23 08:30:12 -07:00
The Android Automerger
2969368f4b merge in lmp-release history after reset to d94854030c 2014-09-23 06:16:24 -07:00
The Android Automerger
15e2cff615 merge in lmp-mr1-release history after reset to d94854030c 2014-09-23 04:46:25 -07:00
Lorenzo Colitti
7a99e281dd am d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev 
* commit 'd94854030c76fc4ee4126ca1707a76fbd1f29126':
  Include the VPN server IP address in the VPN state file.
 2014-09-23 02:53:42 +00:00
Lorenzo Colitti
d94854030c Merge "Include the VPN server IP address in the VPN state file." into lmp-dev 2014-09-23 00:29:59 +00:00
The Android Automerger
68ff95aad4 merge in lmp-mr1-release history after reset to b1982b75c4 2014-09-22 11:44:59 -07:00
The Android Automerger
d57a5b0cb8 merge in lmp-mr1-release history after reset to b1982b75c4 2014-09-22 11:14:20 -07:00
The Android Automerger
0c263b041c merge in lmp-mr1-release history after reset to b1982b75c4 2014-09-22 10:18:17 -07:00
The Android Automerger
da10dcc5dd merge in lmp-release history after reset to b1982b75c4 2014-09-22 06:13:42 -07:00
The Android Automerger
5640d5abe3 merge in lmp-release history after reset to b1982b75c4 2014-09-21 06:11:28 -07:00
The Android Automerger
7de711504d merge in lmp-release history after reset to dcb16082dd 2014-09-20 21:01:53 -07:00
The Android Automerger
888824cc0d merge in lmp-release history after reset to b1982b75c4 2014-09-20 06:12:10 -07:00
Sean Wan
9b8af6e778 am b1982b75: am 60d31a0f: am 3c648e37: Update comment to use correct GPS file for wearable. 
* commit 'b1982b75c4f3d9c812d9c49ca294132430c7cd8d':
  Update comment to use correct GPS file for wearable.
 2014-09-19 22:51:15 +00:00
Sean Wan
0c6e249cba am b1982b75: am 60d31a0f: am 3c648e37: Update comment to use correct GPS file for wearable. 
* commit 'b1982b75c4f3d9c812d9c49ca294132430c7cd8d':
  Update comment to use correct GPS file for wearable.
 2014-09-19 22:26:43 +00:00
Sean Wan
b1982b75c4 am 60d31a0f: am 3c648e37: Update comment to use correct GPS file for wearable. 
* commit '60d31a0fc0724d4538d105a800a1565e5f843130':
  Update comment to use correct GPS file for wearable.
 2014-09-19 22:02:37 +00:00
Sean Wan
60d31a0fc0 am 3c648e37: Update comment to use correct GPS file for wearable. 
* commit '3c648e373a44237c1924fc886daf8418a6e9f4cf':
  Update comment to use correct GPS file for wearable.
 2014-09-19 21:49:11 +00:00
Sean Wan
3c648e373a Update comment to use correct GPS file for wearable. 
Change-Id: I91c4363dbcc6cada8d6e9599d1b15e77febee0e5
 2014-09-19 14:33:51 -07:00
Lajos Molnar
147372fdf9 resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp 
Change-Id: I5e7e6fdf0d2afe6c3e4a0ed6ef96afb4713a72bc
 2014-09-19 06:23:46 -07:00
Lorenzo Colitti
a9e8374c72 Include the VPN server IP address in the VPN state file. 
This will be used by LegacyVpnRunner to create a throw route
pointing at it.

Bug: 17462989
Change-Id: I3ebf0cec726dd12b2c57ba5d66775f8c02b25b70
 2014-09-19 13:27:56 +09:00
Lajos Molnar
435d9cde27 resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp 
Change-Id: I2e9aab90ac53bb32630598f50cc26f6e46acf6d6
 2014-09-18 20:09:39 -07:00
Lajos Molnar
67d8bd66aa surfaceflinger: add getDisplayStats() method 
This is used by media service to schedule video frames at the
proper time, based on precise vsync timings.

Bug: 14659809
Change-Id: I1a90603f3dc09dca9aa4f90a3aa845fab56e0a5e
 2014-09-18 17:03:20 -07:00
The Android Automerger
dcb16082dd merge in lmp-release history after reset to 5bbf73ced3 2014-09-18 06:12:20 -07:00
The Android Automerger
1255b81a87 merge in lmp-release history after reset to 5bbf73ced3 2014-09-17 06:13:11 -07:00