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

51297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Riley Andrews
129dc8423d am edb86f9f: Merge "Add rotation to surfaceflingers screen cap." into lmp-dev 
* commit 'edb86f9f681e082a64a670814ee4d73ccf39942a':
  Add rotation to surfaceflingers screen cap.
 2014-09-09 21:55:26 +00:00
Christopher Ferris
e2c86c71c2 Use time() instead of clock() for timeouts. 
The clock() function returns the processor time used by the process. This
is not a good timeout mechanism since the code is suspended most of the
time waiting for the forked process to finish. Replace with the time()
function.

Bug: 17154069

(cherry picked from commit 89d4949f86)

Change-Id: I42f0f24ee53ef99955fd482a1089e39d491f3bd5
 2014-09-09 13:36:52 -07:00
Christopher Ferris
5ef471c5f9 Merge "Use time() instead of clock() for timeouts." into lmp-dev 2014-09-09 20:29:15 +00:00
Christopher Ferris
89d4949f86 Use time() instead of clock() for timeouts. 
The clock() function returns the processor time used by the process. This
is not a good timeout mechanism since the code is suspended most of the
time waiting for the forked process to finish. Replace with the time()
function.

Bug: 17154069
Change-Id: Ib383329f9db269445d71a100553b08e71fddda3f
 2014-09-09 13:10:49 -07:00
Riley Andrews
d15ef27f9b Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api 
Change-Id: I836649d9d5cd5958ce34e47f26f4a36d2d05d24c
 2014-09-09 19:41:32 +00:00
Riley Andrews
edb86f9f68 Merge "Add rotation to surfaceflingers screen cap." into lmp-dev 2014-09-09 19:40:53 +00:00
Jeff Sharkey
adf754d5d5 am 0ffb9138: am 464e539c: Merge "Add new system APK locations." into lmp-dev 
* commit '0ffb91383f7777ccc8335d7e30d16fd73ca416ed':
  Add new system APK locations.
 2014-09-09 16:54:39 +00:00
Jeff Sharkey
0ffb91383f am 464e539c: Merge "Add new system APK locations." into lmp-dev 
* commit '464e539cd3e931aaca99a67d0addc6d68bd96b3d':
  Add new system APK locations.
 2014-09-09 16:44:52 +00:00
Dan Albert
4762e6f254 am 7d831871: Make string literal concatenation play nice with C++11. 
* commit '7d831871032675e252490b52ddbb29a63e5497bf':
  Make string literal concatenation play nice with C++11.
 2014-09-09 16:34:35 +00:00
Jeff Sharkey
464e539cd3 Merge "Add new system APK locations." into lmp-dev 2014-09-09 16:27:06 +00:00
Dan Albert
7d83187103 Make string literal concatenation play nice with C++11. 
In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user
defined literal. Add space around the macro.

Had missed these when resolving merge conflicts last night.

Change-Id: I1a381a06c3909b76a3b44ce79c37aa6f244d3736
 2014-09-09 09:21:28 -07:00
Jeff Sharkey
770180a4dd Add new system APK locations. 
Add /system/priv-app and /oem/app paths to system paths.  Also allow
rmdex on system apps, and quietly ignore when it was already removed.

Also relax logging when clearing code cache, since it's optional.

Bug: 17205122
Change-Id: I4fc4d0f63a3596937c4defbd64e1f8a1c563f02d
 2014-09-09 08:22:58 -07:00
The Android Automerger
c994b54ba3 merge in lmp-release history after reset to 7eff26a02a 2014-09-09 06:13:08 -07:00
Dan Albert
58a81ba506 am 5273a978: resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp 
* commit '5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c':
  Make string literal concatenation play nice with C++11.
 2014-09-09 05:25:03 +00:00
Dan Albert
5273a97833 resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp 
Change-Id: I82fe2b385156d9bdb9e7183e308d7b2a4167b6ce
 2014-09-08 22:15:20 -07:00
Dan Albert
86aeb9ef15 Merge "Make string literal concatenation play nice with C++11." 2014-09-09 04:02:10 +00:00
Riley Andrews
c3ebe66b49 Add rotation to surfaceflingers screen cap. 
+ This is needed so that activity manager does not
  have to do cpu side rotations when capturing recents
  thumbnails.

Change-Id: If998008e675ad01305db8399fd643cf4608b7025
 2014-09-09 03:51:16 +00:00
Dan Albert
8b49125f10 Make string literal concatenation play nice with C++11. 
In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user
defined literal. Add space around the macro.

Change-Id: I2741f5be9c0b1562e0f413d1309ef9d687e89b41
 2014-09-08 18:53:39 -07:00
Michael Wright
11b9588923 am 0b12929f: am 7eff26a0: Merge "Add FEATURE_GAMEPAD." into lmp-dev 
* commit '0b12929fddd9a4b3c9a857ea360213ffd6e60ef2':
  Add FEATURE_GAMEPAD.
 2014-09-08 23:54:18 +00:00
Michael Wright
0b12929fdd am 7eff26a0: Merge "Add FEATURE_GAMEPAD." into lmp-dev 
* commit '7eff26a02aeb35d6c48e1af8d9bebcc838ad1fd2':
  Add FEATURE_GAMEPAD.
 2014-09-08 23:47:00 +00:00
Michael Wright
7eff26a02a Merge "Add FEATURE_GAMEPAD." into lmp-dev 2014-09-08 23:21:35 +00:00
Nick Kralevich
d0ee7dcad8 am 2a8bb978: am 51eec3b9: Merge "Fix relabeling of secondary user package directories." 
* commit '2a8bb978d506162a2cff801f24659207790cffd3':
  Fix relabeling of secondary user package directories.
 2014-09-08 21:05:31 +00:00
Nick Kralevich
2a8bb978d5 am 51eec3b9: Merge "Fix relabeling of secondary user package directories." 
* commit '51eec3b98788039afc5fd7ffe76612c7f8d9b39c':
  Fix relabeling of secondary user package directories.
 2014-09-08 20:55:32 +00:00
Nick Kralevich
51eec3b987 Merge "Fix relabeling of secondary user package directories." 2014-09-08 20:37:23 +00:00
Stephen Smalley
8ac2a648b6 Fix relabeling of secondary user package directories. 
When relabeling secondary user package directories, we need to use
the uid of the directory rather than the primary package UID;
otherwise, levelFrom=user will not work correctly.

Change-Id: I0d76ec6ec6fe56a566023ca5e1398efdf28fc81e
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-09-08 15:51:55 -04:00
Glenn Kasten
4c51a97849 am 91b6028e: am d44fea68: Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev 
* commit '91b6028e07bc9494afc69ae4f83c3ee49de7d209':
  Make IPowerManager native conform to .aidl for oneway
 2014-09-08 17:04:24 +00:00
Glenn Kasten
91b6028e07 am d44fea68: Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev 
* commit 'd44fea6896a54878d2ed5c9284bb3c4738fc6c54':
  Make IPowerManager native conform to .aidl for oneway
 2014-09-08 16:56:57 +00:00
Glenn Kasten
d44fea6896 Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev 2014-09-08 16:33:55 +00:00
Adam Connors
cb152a556e Add feature flags for verified boot and securely remove users. 
Bug: 17405636
Change-Id: I06c0319f7903787910c52d65025b0d77d9e0575f
 2014-09-08 17:33:16 +01:00
The Android Automerger
4d1022b20c merge in lmp-release history after reset to 0fef06294c 2014-09-08 06:13:51 -07:00
The Android Automerger
be1fa3cfeb merge in lmp-release history after reset to 0fef06294c 2014-09-07 06:11:07 -07:00
Unsuk Jung
21d4d8c548 am 323ccf6f: am 0fef0629: Add feature android.hardware.audio.output xml file 
* commit '323ccf6f961a66f2503958e72ff8279df5e300e4':
  Add feature android.hardware.audio.output xml file
 2014-09-07 09:39:40 +00:00
Unsuk Jung
323ccf6f96 am 0fef0629: Add feature android.hardware.audio.output xml file 
* commit '0fef06294c1e4f0ebb6ac15ec228e96d1afe1d61':
  Add feature android.hardware.audio.output xml file
 2014-09-07 09:25:30 +00:00
Unsuk Jung
0fef06294c Add feature android.hardware.audio.output xml file 
Bug: 15318046
Change-Id: I49f0881752493ac0bad238b43ce7e1e147119528
 2014-09-07 01:54:36 +00:00
Jesse Hall
e786ecab50 Merge "surfaceflinger: fix -Wunused-parameter warning" 2014-09-06 20:14:47 +00:00
Jesse Hall
12aa86a4f1 Merge "surfaceflinger: fix -Wsign-compare warnings" 2014-09-06 20:14:41 +00:00
Jesse Hall
141f0569c3 Merge "surfaceflinger: fix -Woverloaded-virtual warning" 2014-09-06 20:14:35 +00:00
Jesse Hall
c41cddb897 Merge "surfaceflinger: fix -Wmismatched-tags warnings" 2014-09-06 20:14:27 +00:00
Jesse Hall
c2522b682a Merge "GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT" 2014-09-06 20:14:20 +00:00
The Android Automerger
93f065b8c4 merge in lmp-release history after reset to 1f3fc764bc 2014-09-06 08:51:49 -07:00
The Android Automerger
bcb9058cec merge in lmp-release history after reset to 253c4720af 2014-09-06 06:10:51 -07:00
Michael Wright
581ec20bcf Add FEATURE_GAMEPAD. 
This allows micro-consoles or other devices to signify that there's a
game controller in the box, even if the user hasn't connected it.

Change-Id: I93cfba8bd1376aa5d1ec772a5b643b974eaa36c5
 2014-09-05 17:59:01 -07:00
Glenn Kasten
a602086872 Make IPowerManager native conform to .aidl for oneway 
But provide a temporary escape hatch for AudioFlinger.
This oneway option will be removed as soon as possible.

Bug: 16408906
Change-Id: I20d6da1969ae05b96e72795463470eb4c1f8fbdc
 2014-09-05 17:12:24 -07:00
Aravind Akella
ab1ce82009 am 71ec4a81: am 253c4720: Merge "SensorService flush fixes." into lmp-dev 
* commit '71ec4a8179a3f24de04e9a6ac824d896f1835170':
  SensorService flush fixes.
 2014-09-05 21:33:33 +00:00
Aravind Akella
71ec4a8179 am 253c4720: Merge "SensorService flush fixes." into lmp-dev 
* commit '253c4720af3ac631ba04eb379aea91ecc3175cd3':
  SensorService flush fixes.
 2014-09-05 20:21:54 +00:00
Aravind Akella
253c4720af Merge "SensorService flush fixes." into lmp-dev 2014-09-05 19:53:36 +00:00
Eric Laurent
1e73a2def7 am 2c1eae25: am 437353a0: Merge "IPowerManager: make all binder call one way" into lmp-dev 
* commit '2c1eae259c90d5cfcb7715655f3afd59b7bea9ac':
  IPowerManager: make all binder call one way
 2014-09-05 18:04:49 +00:00
Eric Laurent
2c1eae259c am 437353a0: Merge "IPowerManager: make all binder call one way" into lmp-dev 
* commit '437353a0ef596a59ead2dbbe419c249f1e1819e2':
  IPowerManager: make all binder call one way
 2014-09-05 17:53:26 +00:00
Eric Laurent
437353a0ef Merge "IPowerManager: make all binder call one way" into lmp-dev 2014-09-05 17:30:05 +00:00
Jesse Hall
d2e514f717 surfaceflinger: fix -Wunused-parameter warning 
warning: unused parameter 'mustRecompose' [-Wunused-parameter]

Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687
 2014-09-05 09:25:01 -07:00