OSDN Git Service

android-x86/frameworks-native.git
7 years agoAdd an lshal command. am: 85dd3ad89f am: a763ae7121
Yifan Hong [Thu, 26 Jan 2017 18:29:26 +0000 (18:29 +0000)]
Add an lshal command. am: 85dd3ad89f am: a763ae7121
am: 5a0eaa454f

Change-Id: Ifa851e5bb55a870a290b4be134607a744af5f741

7 years agoAdd an lshal command. am: 85dd3ad89f
Yifan Hong [Thu, 26 Jan 2017 18:25:56 +0000 (18:25 +0000)]
Add an lshal command. am: 85dd3ad89f
am: a763ae7121

Change-Id: I627e16e1216e09dccbc96db26dfba844e073d403

7 years agoAdd an lshal command.
Yifan Hong [Thu, 26 Jan 2017 18:23:02 +0000 (18:23 +0000)]
Add an lshal command.
am: 85dd3ad89f

Change-Id: I43be1cd548f30d7d6e954411fc3db8b13e20f3c0

7 years agoMerge "Fix two bugs in external storage accounting." am: d1361ceb0c am: e4dc5d4ec5
Jeff Sharkey [Thu, 26 Jan 2017 17:45:35 +0000 (17:45 +0000)]
Merge "Fix two bugs in external storage accounting." am: d1361ceb0c am: e4dc5d4ec5
am: 0f08cf28bd

Change-Id: Ib784b3bbeb49c56b0f2f2b180c04fc6bec14e68b

7 years agoMerge "Fix two bugs in external storage accounting." am: d1361ceb0c
Jeff Sharkey [Thu, 26 Jan 2017 17:43:07 +0000 (17:43 +0000)]
Merge "Fix two bugs in external storage accounting." am: d1361ceb0c
am: e4dc5d4ec5

Change-Id: I61ec7deb5d7196259e83de0a141ef23d198b9f1e

7 years agoMerge "Fix two bugs in external storage accounting."
Jeff Sharkey [Thu, 26 Jan 2017 17:40:36 +0000 (17:40 +0000)]
Merge "Fix two bugs in external storage accounting."
am: d1361ceb0c

Change-Id: I6f661104fbe8527bfbb1f9599beb395e5bc9d218

7 years agoMerge "Fix two bugs in external storage accounting."
Treehugger Robot [Thu, 26 Jan 2017 17:37:23 +0000 (17:37 +0000)]
Merge "Fix two bugs in external storage accounting."

7 years agoAdd an lshal command.
Yifan Hong [Wed, 25 Jan 2017 22:20:34 +0000 (14:20 -0800)]
Add an lshal command.

lshal lists services registered to the binderized
IServiceManager and all services available to the
passthrough IServiceManager as *.so libraries. It
also dumps the reference count for each service.

Bug: 34712252
Test: adb shell lshal
Change-Id: I9436a033cf736b8a8c307a2e87549c9db6379f3f

7 years agoFix two bugs in external storage accounting.
Jeff Sharkey [Thu, 26 Jan 2017 05:15:42 +0000 (22:15 -0700)]
Fix two bugs in external storage accounting.

When doing a manual tree walk, we always want to inherit fts_number
from the parent fts node.

For create_data_media_package_path(), two of the arguments had been
swapped.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 2794881730927649
Change-Id: Ic3cbf387cf119aa82af6e380bde9d9b069f6bfb0

7 years agoMerge "Add mode to open call with O_CREAT" am: af78fe13a0 am: f6b468db7b
George Burgess IV [Thu, 26 Jan 2017 01:37:08 +0000 (01:37 +0000)]
Merge "Add mode to open call with O_CREAT" am: af78fe13a0 am: f6b468db7b
am: 2b0fedb71e

Change-Id: I7710b8e0e21243edf1136fa87bb36655bc5b5b95

7 years agoMerge "Add mode to open call with O_CREAT" am: af78fe13a0
George Burgess IV [Thu, 26 Jan 2017 01:34:39 +0000 (01:34 +0000)]
Merge "Add mode to open call with O_CREAT" am: af78fe13a0
am: f6b468db7b

Change-Id: I6ec7cd3bfa79ac95a042e26455073cb3cbec60c3

7 years agoMerge "Add mode to open call with O_CREAT"
George Burgess IV [Thu, 26 Jan 2017 01:32:36 +0000 (01:32 +0000)]
Merge "Add mode to open call with O_CREAT"
am: af78fe13a0

Change-Id: I488ffb3be9152532fd3e7eddd7bc78d311673420

7 years agoMerge "Add mode to open call with O_CREAT"
Treehugger Robot [Thu, 26 Jan 2017 01:25:52 +0000 (01:25 +0000)]
Merge "Add mode to open call with O_CREAT"

7 years agoAdd mode to open call with O_CREAT
George Burgess IV [Wed, 25 Jan 2017 21:51:53 +0000 (13:51 -0800)]
Add mode to open call with O_CREAT

This change was already applied internally. For us to submit FORTIFY, we
need to push it out here. Otherwise, we get compile-time errors about
this.

Bug: 32073964
Test: Builds with FORTIFY.
Change-Id: Ib500aca933468c06f7ceb796a9bb6a16c118e366
Merged-In: I63eb3d5499ae7e9ff9a77393763e39b747fd4611

7 years agoMerge "Properly align a packed structure." am: 24257dda48 am: 7e500210be
Stephen Hines [Tue, 24 Jan 2017 02:22:06 +0000 (02:22 +0000)]
Merge "Properly align a packed structure." am: 24257dda48 am: 7e500210be
am: bfee6aee59

Change-Id: I801b129aa66816d9639f9b089ca35fc82caf69fa

7 years agoMerge "Properly align a packed structure." am: 24257dda48
Stephen Hines [Tue, 24 Jan 2017 01:21:35 +0000 (01:21 +0000)]
Merge "Properly align a packed structure." am: 24257dda48
am: 7e500210be

Change-Id: If09a200e9efa35ecc8611d087a7ba63f99f2a330

7 years agoMerge "Properly align a packed structure."
Stephen Hines [Tue, 24 Jan 2017 01:20:04 +0000 (01:20 +0000)]
Merge "Properly align a packed structure."
am: 24257dda48

Change-Id: I66d07aab4dfa72afe44270d866514102f660aab6

7 years agoMerge "Properly align a packed structure."
Treehugger Robot [Tue, 24 Jan 2017 01:15:06 +0000 (01:15 +0000)]
Merge "Properly align a packed structure."

7 years agoMerge "Update atrace to work with tracefs, not debugfs" am: a92616ecfe am: ea7c1845ee
Paul Lawrence [Mon, 23 Jan 2017 18:34:25 +0000 (18:34 +0000)]
Merge "Update atrace to work with tracefs, not debugfs" am: a92616ecfe am: ea7c1845ee
am: 00613eaf8d

Change-Id: Ia24e8eb3bc9b1b9ea5ce4047233c3cbd82016e29

7 years agoMerge "Update atrace to work with tracefs, not debugfs" am: a92616ecfe
Paul Lawrence [Mon, 23 Jan 2017 18:31:12 +0000 (18:31 +0000)]
Merge "Update atrace to work with tracefs, not debugfs" am: a92616ecfe
am: ea7c1845ee

Change-Id: I5e31ed34bbaf173577b3b33bbda0f4e4c6a67f92

7 years agoMerge "Update atrace to work with tracefs, not debugfs"
Paul Lawrence [Mon, 23 Jan 2017 18:26:56 +0000 (18:26 +0000)]
Merge "Update atrace to work with tracefs, not debugfs"
am: a92616ecfe

Change-Id: I139cd33d0a943bff3385cbd3ebc52eb47bc82be5

7 years agoMerge "Update atrace to work with tracefs, not debugfs"
Treehugger Robot [Mon, 23 Jan 2017 18:20:51 +0000 (18:20 +0000)]
Merge "Update atrace to work with tracefs, not debugfs"

7 years agoMerge "dumpsys: add option to list hardware services." am: 4d741ebedc am: 57d82aa9fd
Steven Moreland [Sat, 21 Jan 2017 21:24:59 +0000 (21:24 +0000)]
Merge "dumpsys: add option to list hardware services." am: 4d741ebedc am: 57d82aa9fd
am: 42b3ff58a6

Change-Id: If9c58d07862e23e96ce89dc0fa282f49302379bb

7 years agoMerge "dumpsys: add option to list hardware services." am: 4d741ebedc
Steven Moreland [Sat, 21 Jan 2017 21:20:28 +0000 (21:20 +0000)]
Merge "dumpsys: add option to list hardware services." am: 4d741ebedc
am: 57d82aa9fd

Change-Id: Ife39a9b63ccf7a8fd83ad9b142c68cb0b0f321e4

7 years agoMerge "dumpsys: add option to list hardware services."
Steven Moreland [Sat, 21 Jan 2017 21:15:29 +0000 (21:15 +0000)]
Merge "dumpsys: add option to list hardware services."
am: 4d741ebedc

Change-Id: I78070b7363e0562a0b236035989dcb9ae666d6d6

7 years agoMerge "dumpsys: add option to list hardware services."
Treehugger Robot [Sat, 21 Jan 2017 21:11:50 +0000 (21:11 +0000)]
Merge "dumpsys: add option to list hardware services."

7 years agolibEGL: Add initialization tracing
Jesse Hall [Sat, 21 Jan 2017 05:26:22 +0000 (05:26 +0000)]
libEGL: Add initialization tracing
am: bb5a921fef  -s ours

Change-Id: Ic964dad618db0a3f55f55b607330d5acddf6b676

7 years agodumpsys: add option to list hardware services.
Steven Moreland [Fri, 20 Jan 2017 23:24:51 +0000 (15:24 -0800)]
dumpsys: add option to list hardware services.

This gives a convenient way to dump information about hidl services.
When hidl services dump information themselves as well, that dump will
be made here as well.

Bug: 33382892
Test: dumpsys_test, dumpsys --hw works as expected
Change-Id: Ib08b5d052e63ed6260035ee8d3ad3dac296202b1

7 years agolibEGL: Add initialization tracing
Jesse Hall [Fri, 20 Jan 2017 01:43:26 +0000 (17:43 -0800)]
libEGL: Add initialization tracing

The first call to eglGetDisplay() loads drivers and initializes
dispatch tables. This currently takes significant time (85-100 ms),
and can must be done before the first frame of an app can be shown.

This change adds systrace markers for the major parts of this process,
as a precursor to optimizing them.

Bug: 34404021
Test: manual systrace of calculator app startup on bullhead
Change-Id: Ibdd62ba4eb0d69e472c64081554c16283967ae08
Merged-In: If1ecb5a81f9d33daf72c6f3e5b403972f8529b2d

7 years agoMerge "libEGL: Add initialization tracing" into nyc-mr2-dev-plus-aosp
Jesse Hall [Fri, 20 Jan 2017 23:57:58 +0000 (23:57 +0000)]
Merge "libEGL: Add initialization tracing" into nyc-mr2-dev-plus-aosp

7 years agoUpdate atrace to work with tracefs, not debugfs
Paul Lawrence [Tue, 17 Jan 2017 17:50:18 +0000 (09:50 -0800)]
Update atrace to work with tracefs, not debugfs

When tracefs is mounted, tracing is under /sys/kernel/tracing not
/sys/kernel/debug/tracing. Modify atrace to detect this situation and
get the right files.

Bug: 31856701
Test: Run atrace, check output is same where ever tracefs is mounted
Change-Id: I78df0da91d9f56c56077d1b8b9dba7b0126b2d8d

7 years agoMerge "Add Binder support for Parcelable exceptions." am: 7ebfeb9d1c am: fa418b2b15
Jeff Sharkey [Fri, 20 Jan 2017 23:03:51 +0000 (23:03 +0000)]
Merge "Add Binder support for Parcelable exceptions." am: 7ebfeb9d1c am: fa418b2b15
am: cd9254082d

Change-Id: I0ab52eaf2b93da53396cec416a8a0a0e30220b4c

7 years agoMerge "Add Binder support for Parcelable exceptions." am: 7ebfeb9d1c
Jeff Sharkey [Fri, 20 Jan 2017 22:56:56 +0000 (22:56 +0000)]
Merge "Add Binder support for Parcelable exceptions." am: 7ebfeb9d1c
am: fa418b2b15

Change-Id: I59c64df526ae8ba0c07532f983a224b72b427060

7 years agoMerge "Add Binder support for Parcelable exceptions."
Jeff Sharkey [Fri, 20 Jan 2017 22:49:47 +0000 (22:49 +0000)]
Merge "Add Binder support for Parcelable exceptions."
am: 7ebfeb9d1c

Change-Id: Ia9fe213e51fef0fe2b000ed188b943079f9c9535

7 years agoMerge "Add Binder support for Parcelable exceptions."
Jeff Sharkey [Fri, 20 Jan 2017 22:45:03 +0000 (22:45 +0000)]
Merge "Add Binder support for Parcelable exceptions."

7 years agolibEGL: Add initialization tracing
Jesse Hall [Fri, 20 Jan 2017 01:43:26 +0000 (17:43 -0800)]
libEGL: Add initialization tracing

The first call to eglGetDisplay() loads drivers and initializes
dispatch tables. This currently takes significant time (85-100 ms),
and can must be done before the first frame of an app can be shown.

This change adds systrace markers for the major parts of this process,
as a precursor to optimizing them.

Bug: 34404021
Test: manual systrace of calculator app startup on bullhead
Change-Id: If1ecb5a81f9d33daf72c6f3e5b403972f8529b2d

7 years agoMerge "Add i2c tracing support to atrace" am: 2630e78f53 am: 8b6f035960
Michael Wright [Fri, 20 Jan 2017 20:15:25 +0000 (20:15 +0000)]
Merge "Add i2c tracing support to atrace" am: 2630e78f53 am: 8b6f035960
am: 1fd4f885dc

Change-Id: Ic643712f08bad7561b3d490513d25da94ac64c20

7 years agoMerge "Add i2c tracing support to atrace" am: 2630e78f53
Michael Wright [Fri, 20 Jan 2017 20:12:55 +0000 (20:12 +0000)]
Merge "Add i2c tracing support to atrace" am: 2630e78f53
am: 8b6f035960

Change-Id: Ie9ec292bfaa8f2ea6f29daeca624edda6c5e18af

7 years agoMerge "Add i2c tracing support to atrace"
Michael Wright [Fri, 20 Jan 2017 20:10:25 +0000 (20:10 +0000)]
Merge "Add i2c tracing support to atrace"
am: 2630e78f53

Change-Id: Icc06121228858c35b90ef5ad0d4a0ecc470a3909

7 years agoMerge "Add i2c tracing support to atrace"
Treehugger Robot [Fri, 20 Jan 2017 20:07:13 +0000 (20:07 +0000)]
Merge "Add i2c tracing support to atrace"

7 years agoMerge "Add feature flag for TelephonyManager#get/setAllowedCarriers" am: c4fc77792c...
Polina Bondarenko [Fri, 20 Jan 2017 20:05:42 +0000 (20:05 +0000)]
Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers" am: c4fc77792c am: 969f4742f4
am: 1b11e44b94

Change-Id: Ied26a01c8b70c897fe5cb775436447620d1baa97

7 years agoMerge "Add feature flag for TelephonyManager#get/setAllowedCarriers" am: c4fc77792c
Polina Bondarenko [Fri, 20 Jan 2017 20:03:12 +0000 (20:03 +0000)]
Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers" am: c4fc77792c
am: 969f4742f4

Change-Id: I7e755924f2a3e1556fcdc47068c0a863276ce984

7 years agoMerge "Add feature flag for TelephonyManager#get/setAllowedCarriers"
Polina Bondarenko [Fri, 20 Jan 2017 20:01:12 +0000 (20:01 +0000)]
Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers"
am: c4fc77792c

Change-Id: I4368431b3537bde427d8bb68f33fc8b6cf876f15

7 years agoMerge "Add feature flag for TelephonyManager#get/setAllowedCarriers"
Treehugger Robot [Fri, 20 Jan 2017 19:55:15 +0000 (19:55 +0000)]
Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers"

7 years agoAdd i2c tracing support to atrace
Michael Wright [Thu, 18 Aug 2016 18:56:43 +0000 (19:56 +0100)]
Add i2c tracing support to atrace

Cherry-picking from internal master

Test: None
Change-Id: Iaf0daa0982bd8d2355d3590d43ad78711e764ee0

7 years agoMerge "Measure external storage using new GIDs." am: f5a21ba425 am: 973d5aeb17
Jeff Sharkey [Thu, 19 Jan 2017 22:09:20 +0000 (22:09 +0000)]
Merge "Measure external storage using new GIDs." am: f5a21ba425 am: 973d5aeb17
am: 9715247a54

Change-Id: Ic1687f3b78ba2b3be689eb9462f568e7a68c54d8

7 years agoMerge "Measure external storage using new GIDs." am: f5a21ba425
Jeff Sharkey [Thu, 19 Jan 2017 22:06:49 +0000 (22:06 +0000)]
Merge "Measure external storage using new GIDs." am: f5a21ba425
am: 973d5aeb17

Change-Id: If3e585b5a35faa1f0151351affa23b382976dc4a

7 years agoMerge "Measure external storage using new GIDs."
Jeff Sharkey [Thu, 19 Jan 2017 22:04:19 +0000 (22:04 +0000)]
Merge "Measure external storage using new GIDs."
am: f5a21ba425

Change-Id: Id8f48276b4768a9e49b943e7142c33d7a365374a

7 years agoMerge "Measure external storage using new GIDs."
Jeff Sharkey [Thu, 19 Jan 2017 22:00:50 +0000 (22:00 +0000)]
Merge "Measure external storage using new GIDs."

7 years agoMerge "First pass at updated cache clearing logic." am: 45270e18cc am: fe40750da2
Jeff Sharkey [Thu, 19 Jan 2017 16:29:34 +0000 (16:29 +0000)]
Merge "First pass at updated cache clearing logic." am: 45270e18cc am: fe40750da2
am: 19c96b49b5

Change-Id: Ide4a9e17f76b3f136c2f13b0558a6130865226f4

7 years agoMerge "First pass at updated cache clearing logic." am: 45270e18cc
Jeff Sharkey [Thu, 19 Jan 2017 16:25:10 +0000 (16:25 +0000)]
Merge "First pass at updated cache clearing logic." am: 45270e18cc
am: fe40750da2

Change-Id: I54afc93c8d39857a63906b0cb8ec72f4aba4f6d4

7 years agoMeasure external storage using new GIDs.
Jeff Sharkey [Thu, 19 Jan 2017 16:21:36 +0000 (09:21 -0700)]
Measure external storage using new GIDs.

We just defined a new range of GIDs that will be used to mark per-app
data files stored on external storage, so start measuring them.

Also measure all OBB files using another new GID that was defined.

Note that we're relying on the per-app cache GIDs to track cache
usage on *both* internal and external storage, which means that stats
and extStats won't always add up.  (The framework already combines
these values together, and we didn't want to waste precious GID
space on explicitly tracking cache files on external storage.)

Test: builds, boots
Bug: 2794881734263266
Change-Id: Ife087df299ff8ee1a75fce1e39b4b737cf9375d5

7 years agoMerge "First pass at updated cache clearing logic."
Jeff Sharkey [Thu, 19 Jan 2017 16:20:50 +0000 (16:20 +0000)]
Merge "First pass at updated cache clearing logic."
am: 45270e18cc

Change-Id: Icade9c982866bb45c63cc484b77820fb9c1b77ea

7 years agoMerge "First pass at updated cache clearing logic."
Jeff Sharkey [Thu, 19 Jan 2017 16:16:02 +0000 (16:16 +0000)]
Merge "First pass at updated cache clearing logic."

7 years agoMerge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am: 29280addfd am: 4925ffcbec
Peng Xu [Thu, 19 Jan 2017 01:26:57 +0000 (01:26 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am: 29280addfd am: 4925ffcbec
am: ce7bcb28ff

Change-Id: I9a241d3ecf5c7bee929f42bcba4438a60e36f94c

7 years agoMerge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am: 29280addfd
Peng Xu [Thu, 19 Jan 2017 01:21:12 +0000 (01:21 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am: 29280addfd
am: 4925ffcbec

Change-Id: Id48ac0e29a62e17495ae0ae7f4b5741e89e93121

7 years agoMerge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
Peng Xu [Thu, 19 Jan 2017 01:17:56 +0000 (01:17 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
am: 29280addfd

Change-Id: I45ad2448abf8da0ab2d1cdc4e29c7d2d30d3affe

7 years agoMerge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
Peng Xu [Thu, 19 Jan 2017 01:11:49 +0000 (01:11 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"

7 years agoMerge "Clean up and simplify the logic in dexopt" am: 57eb11ed2d am: 617b5a2bf9
Calin Juravle [Thu, 19 Jan 2017 00:05:50 +0000 (00:05 +0000)]
Merge "Clean up and simplify the logic in dexopt" am: 57eb11ed2d am: 617b5a2bf9
am: f136f947d6

Change-Id: Iaaa9430484e8d30f5e70df193a4a56ed08bfc12a

7 years agoMerge changes from topic 'kill_debuggerd' am: 134a7193a0 am: b1a94fb6e5
Josh Gao [Wed, 18 Jan 2017 23:58:35 +0000 (23:58 +0000)]
Merge changes from topic 'kill_debuggerd' am: 134a7193a0 am: b1a94fb6e5
am: 2f7864a3a5

Change-Id: Ie88f3881c3ca210cf7950138b5f28659de14ed03

7 years agodumpstate: use O_APPEND for anr file. am: 989b812dcd am: b0f08f67fd
Josh Gao [Wed, 18 Jan 2017 23:58:23 +0000 (23:58 +0000)]
dumpstate: use O_APPEND for anr file. am: 989b812dcd am: b0f08f67fd
am: 67e3e53dd9

Change-Id: I446b797e3f8cb9d4299509fb34b84f5b25336300

7 years agoMerge "Clean up and simplify the logic in dexopt" am: 57eb11ed2d
Calin Juravle [Wed, 18 Jan 2017 23:57:34 +0000 (23:57 +0000)]
Merge "Clean up and simplify the logic in dexopt" am: 57eb11ed2d
am: 617b5a2bf9

Change-Id: I296990f67265262156b96d9b1353ce5d24e744ec

7 years agoMerge "Clean up and simplify the logic in dexopt"
Calin Juravle [Wed, 18 Jan 2017 23:52:24 +0000 (23:52 +0000)]
Merge "Clean up and simplify the logic in dexopt"
am: 57eb11ed2d

Change-Id: I9571ed4171d592d78e76278ffbeee9f978d4de43

7 years agoMerge "Clean up and simplify the logic in dexopt"
Calin Juravle [Wed, 18 Jan 2017 23:49:13 +0000 (23:49 +0000)]
Merge "Clean up and simplify the logic in dexopt"

7 years agoMerge changes from topic 'kill_debuggerd' am: 134a7193a0
Josh Gao [Wed, 18 Jan 2017 23:45:52 +0000 (23:45 +0000)]
Merge changes from topic 'kill_debuggerd' am: 134a7193a0
am: b1a94fb6e5

Change-Id: I62a2dee60f16c47be0614b9688e92a290e4f45c7

7 years agodumpstate: use O_APPEND for anr file. am: 989b812dcd
Josh Gao [Wed, 18 Jan 2017 23:45:40 +0000 (23:45 +0000)]
dumpstate: use O_APPEND for anr file. am: 989b812dcd
am: b0f08f67fd

Change-Id: Ic0fb8b7a328edcaa62c725d84aea74d9404e6ee9

7 years agoresolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp
Josh Gao [Wed, 18 Jan 2017 23:43:23 +0000 (23:43 +0000)]
resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp
am: 27cdfc3e9d

Change-Id: I0219baebce53482f730cfb73ae600be01bbeb224

7 years agoresolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp
Josh Gao [Wed, 18 Jan 2017 23:39:44 +0000 (15:39 -0800)]
resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp

Change-Id: I5a9fbde2637d746bfd32d5b7546777708746e6d9

7 years agoMerge changes from topic 'kill_debuggerd'
Josh Gao [Wed, 18 Jan 2017 23:19:49 +0000 (23:19 +0000)]
Merge changes from topic 'kill_debuggerd'
am: 134a7193a0

Change-Id: Icb705df114dc073ef66507c59884e77ea1cf828b

7 years agodumpstate: use O_APPEND for anr file.
Josh Gao [Wed, 18 Jan 2017 23:19:31 +0000 (23:19 +0000)]
dumpstate: use O_APPEND for anr file.
am: 989b812dcd

Change-Id: Ibaa04b99195886df0ff14b2f6569e37918373619

7 years agodumpstate: switch to using libdebuggerd_client.
Josh Gao [Wed, 18 Jan 2017 23:16:29 +0000 (23:16 +0000)]
dumpstate: switch to using libdebuggerd_client.
am: d2db024a86

Change-Id: I219627b359a88b8a694b4f4cd46de9cea9767655

7 years agoMerge "libGLES_android: Add generic 32bpp BGRA EGLConfig" am: 0233bd47ed am: 190197d914
Amit Pundir [Wed, 18 Jan 2017 23:08:21 +0000 (23:08 +0000)]
Merge "libGLES_android: Add generic 32bpp BGRA EGLConfig" am: 0233bd47ed am: 190197d914
am: 354b20fe58

Change-Id: I5e2ff1378104c2e520d7a58762d88c4fc0981c0e

7 years agoMerge "libGLES_android: Add generic 32bpp BGRA EGLConfig" am: 0233bd47ed
Amit Pundir [Wed, 18 Jan 2017 23:06:20 +0000 (23:06 +0000)]
Merge "libGLES_android: Add generic 32bpp BGRA EGLConfig" am: 0233bd47ed
am: 190197d914

Change-Id: I2136f3da54052e56344d6c491bbe94e9303d01b9

7 years agoMerge "libGLES_android: Add generic 32bpp BGRA EGLConfig"
Amit Pundir [Wed, 18 Jan 2017 23:04:54 +0000 (23:04 +0000)]
Merge "libGLES_android: Add generic 32bpp BGRA EGLConfig"
am: 0233bd47ed

Change-Id: Ie6f7c202ceb22e76e28ad5973cf668bddd3b8552

7 years agoMerge changes from topic 'kill_debuggerd'
Josh Gao [Wed, 18 Jan 2017 23:04:08 +0000 (23:04 +0000)]
Merge changes from topic 'kill_debuggerd'

* changes:
  dumpstate: use O_APPEND for anr file.
  dumpstate: switch to using libdebuggerd_client.

7 years agoMerge "libGLES_android: Add generic 32bpp BGRA EGLConfig"
Treehugger Robot [Wed, 18 Jan 2017 23:00:41 +0000 (23:00 +0000)]
Merge "libGLES_android: Add generic 32bpp BGRA EGLConfig"

7 years agoClean up and simplify the logic in dexopt
Calin Juravle [Sun, 15 Jan 2017 00:23:30 +0000 (16:23 -0800)]
Clean up and simplify the logic in dexopt

Make some order in dexopt logic by extracting independent parts in their
own helpers.

It will make further updates of dexopt simpler and easier to reason
about (e.g. for secondary dex files).

Test: device boots
      adb shell cmd package compile -m speed|speed-profile packageName
      install new packages

Bug: 32871170

(cherry picked from commit 4a391f80601d7f65d7e63353363e6d32868161d5)

Change-Id: If0c96174e904519a4332e54553690b691ff63149

7 years agoFirst pass at updated cache clearing logic.
Jeff Sharkey [Wed, 18 Jan 2017 01:05:54 +0000 (18:05 -0700)]
First pass at updated cache clearing logic.

The old clearing algorithm is very naive and it sorts all cached files
globally by modified time.  This sadly lets apps gamify the system by
setting their modified times far in the future, and it's very
expensive because it requires a global filesystem traversal to free
up even the smallest amount of data.

Instead, this CL introduces a much more fair cache clearing algorithm
that deletes files from specific UIDs based on how much cache space
that UID is using proportional to the space allocated to them.  This
new design has several nice properties:

-- It uses the recently added quotactl() feature to rapidly target
the apps that are using the most space.
-- We only need to traverse the filesystem for UIDs that actively
enter the crosshairs of the clearing algorithm.
-- Disciplined apps who stay under their allocated quota will be
the last to have their cached data cleared.
-- This design can be easily adapted to support additional features
such as atomic purging and tombstones.

In summary, the new algorithm is extremely efficient when freeing up
the typical small-to-medium amounts of disk space, and is only
moderately less efficient than the old algorithm when forced to clear
all cached data.

Test: builds, boots, clearing strategy looks sane
Bug: 33965858
Change-Id: I66f95089cb33f1add3f31fcf1082ab2469870fda

7 years agoAdd feature flag for TelephonyManager#get/setAllowedCarriers
Polina Bondarenko [Thu, 12 Jan 2017 20:14:14 +0000 (21:14 +0100)]
Add feature flag for TelephonyManager#get/setAllowedCarriers

Add android.hardware.telephony.carrierlock feature flag declaration.

Bug: 33480084
Test: cts
Change-Id: Ib6ede97d7ee8d6e924c1483ee51f52bdfa09950b

7 years agoMerge "Add systrace details to storage measurements." am: a693382d94 am: b0858a472e
Jeff Sharkey [Wed, 18 Jan 2017 01:29:12 +0000 (01:29 +0000)]
Merge "Add systrace details to storage measurements." am: a693382d94 am: b0858a472e
am: 6248cde3b3

Change-Id: I2d259e341128528ef0d81e9dea4631527efd48dc

7 years agoMerge "Add systrace details to storage measurements." am: a693382d94
Jeff Sharkey [Wed, 18 Jan 2017 01:22:27 +0000 (01:22 +0000)]
Merge "Add systrace details to storage measurements." am: a693382d94
am: b0858a472e

Change-Id: I37efa4372b36d97e0fbbac362d74e66957eca569

7 years agoMerge "Add systrace details to storage measurements."
Jeff Sharkey [Wed, 18 Jan 2017 01:17:47 +0000 (01:17 +0000)]
Merge "Add systrace details to storage measurements."
am: a693382d94

Change-Id: I4bdc09bd3e62dfbc522b527537bcd526a391fbaf

7 years agoMerge "Add systrace details to storage measurements."
Jeff Sharkey [Wed, 18 Jan 2017 01:10:59 +0000 (01:10 +0000)]
Merge "Add systrace details to storage measurements."

7 years agoMerge "servicemanager: selinux: set selinux callbacks early" am: bfbe2d711c am: a7575...
Sandeep Patil [Wed, 18 Jan 2017 00:51:16 +0000 (00:51 +0000)]
Merge "servicemanager: selinux: set selinux callbacks early" am: bfbe2d711c am: a7575ec40f
am: f32881a401

Change-Id: I0d6dfd8a807cec0b9cdefab79f3bcfe817976579

7 years agoMerge "servicemanager: selinux: set selinux callbacks early" am: bfbe2d711c
Sandeep Patil [Wed, 18 Jan 2017 00:46:46 +0000 (00:46 +0000)]
Merge "servicemanager: selinux: set selinux callbacks early" am: bfbe2d711c
am: a7575ec40f

Change-Id: Id220cef18e1b003f5c0edd3a8da4d2871d2055a9

7 years agoMerge "servicemanager: selinux: set selinux callbacks early"
Sandeep Patil [Wed, 18 Jan 2017 00:41:34 +0000 (00:41 +0000)]
Merge "servicemanager: selinux: set selinux callbacks early"
am: bfbe2d711c

Change-Id: I0e3e088eb3d8404d1707ac61aa18eda5f0cbad8d

7 years agoMerge "servicemanager: selinux: set selinux callbacks early"
Treehugger Robot [Wed, 18 Jan 2017 00:36:55 +0000 (00:36 +0000)]
Merge "servicemanager: selinux: set selinux callbacks early"

7 years agoAdd systrace details to storage measurements.
Jeff Sharkey [Tue, 17 Jan 2017 22:25:01 +0000 (15:25 -0700)]
Add systrace details to storage measurements.

Can be used to find bottlenecks, and confirm that quota stuff is
being used when expected.

Test: builds, boots
Bug: 34341727
Change-Id: Ifefc155e5d3b0c74245e0d287e84df699ce09d16

7 years agodumpstate: use O_APPEND for anr file.
Josh Gao [Sat, 14 Jan 2017 06:09:40 +0000 (22:09 -0800)]
dumpstate: use O_APPEND for anr file.

Bug: http://b/30705528
Test: ran dumpstate, grepped dmesg for new selinux denials
Change-Id: I28814edcf37a7edbde79279feff0e7def64316f2

7 years agodumpstate: switch to using libdebuggerd_client.
Josh Gao [Fri, 6 Jan 2017 02:27:33 +0000 (18:27 -0800)]
dumpstate: switch to using libdebuggerd_client.

Bug: http://b/30705528
Test: manual inspection of dumpstate output
Change-Id: I8f9822f67f1a81fcfa2b3a9120e6631b19b29854

7 years agoAdd Binder support for Parcelable exceptions.
Jeff Sharkey [Tue, 17 Jan 2017 20:53:04 +0000 (13:53 -0700)]
Add Binder support for Parcelable exceptions.

Follow the new framework changes that support sending EX_PARCELABLE
exception types.

Test: builds, boots
Bug: 33749182
Change-Id: I7a856fa89f23aab4f782c4e5ae2beb8166fa8da4

7 years agoEGL: Load updated EGL/GLES drivers
Jesse Hall [Tue, 17 Jan 2017 20:31:46 +0000 (20:31 +0000)]
EGL: Load updated EGL/GLES drivers
am: a91f64cbe1  -s ours

Change-Id: I6a26eb01dfdcc27e3fedf61b03159862f0dd6da8

7 years agoLoad updated drivers using derived loader namespace
Jesse Hall [Tue, 17 Jan 2017 20:31:37 +0000 (20:31 +0000)]
Load updated drivers using derived loader namespace
am: afd02885b9  -s ours

Change-Id: Iea9d3a6d7efb7224a9c7b52e737299b921a704d3

7 years agoEGL: Load updated EGL/GLES drivers
Jesse Hall [Tue, 20 Dec 2016 23:24:28 +0000 (15:24 -0800)]
EGL: Load updated EGL/GLES drivers

Because the driver namespace is stored in libgui, and libgui depends
on libEGL, this required a hack for libEGL to access the namespace.
See the comment added in GraphicsEnv.h for details; the summary is
that the libgui->libEGL dependency should go away, and then libEGL can
depend on libgui directly.

For system drivers, the loader would happily load anything named
lib{GLES,EGL,GLESv2,GLESv1_CM}_*.so in /vendor/lib[64]/egl, for
backward-compatibility with the old and no-longer-supported egl.cfg
system. However, it preferred unsuffixed names. That's not actually a
good idea, since the DT_SONAME would clash with the system libraries.
For updated drivers, we only look for suffixes from the
ro.hardware.egl and ro.board.platform system properties, similar to
the Vulkan and HAL library search. A future change (tied to a future
release) will do the same for system drivers.

Bug: 33531483
Test: Launch GLES apps w/ and w/o updated driver package
Change-Id: Ibfbb275629b0c6cf9c51314aea1361e81ff72d4b

7 years agoLoad updated drivers using derived loader namespace
Jesse Hall [Thu, 15 Dec 2016 00:54:06 +0000 (16:54 -0800)]
Load updated drivers using derived loader namespace

Bug: 33531483
Test: Launch vulkan apps w/ and w/o updated driver package
Change-Id: Ia73e1e33b637d6ffd96ea0480ed6d85b9f68dce3

7 years agoMerge "Handle devices without quota, speed up lookup." am: 36ba03a248 am: 411ae16a91
Jeff Sharkey [Tue, 17 Jan 2017 18:07:20 +0000 (18:07 +0000)]
Merge "Handle devices without quota, speed up lookup." am: 36ba03a248 am: 411ae16a91
am: 9eeb77f0dd

Change-Id: I6f6004769a576003a5fb27bcd78470badf43d68a

7 years agoMerge "Handle devices without quota, speed up lookup." am: 36ba03a248
Jeff Sharkey [Tue, 17 Jan 2017 17:47:16 +0000 (17:47 +0000)]
Merge "Handle devices without quota, speed up lookup." am: 36ba03a248
am: 411ae16a91

Change-Id: Icb7deaa5e60880d783fc4c434bbd0e70ad2c188b

7 years agoEGL: Load updated EGL/GLES drivers
Jesse Hall [Tue, 20 Dec 2016 23:24:28 +0000 (15:24 -0800)]
EGL: Load updated EGL/GLES drivers

Because the driver namespace is stored in libgui, and libgui depends
on libEGL, this required a hack for libEGL to access the namespace.
See the comment added in GraphicsEnv.h for details; the summary is
that the libgui->libEGL dependency should go away, and then libEGL can
depend on libgui directly.

For system drivers, the loader would happily load anything named
lib{GLES,EGL,GLESv2,GLESv1_CM}_*.so in /vendor/lib[64]/egl, for
backward-compatibility with the old and no-longer-supported egl.cfg
system. However, it preferred unsuffixed names. That's not actually a
good idea, since the DT_SONAME would clash with the system libraries.
For updated drivers, we only look for suffixes from the
ro.hardware.egl and ro.board.platform system properties, similar to
the Vulkan and HAL library search. A future change (tied to a future
release) will do the same for system drivers.

Bug: 33531483
Change-Id: If6eb7dbbc37f219c999e20a983569d4c4e73bda1
Merged-In: Ibfbb275629b0c6cf9c51314aea1361e81ff72d4b

7 years agoLoad updated drivers using derived loader namespace
Jesse Hall [Thu, 15 Dec 2016 00:54:06 +0000 (16:54 -0800)]
Load updated drivers using derived loader namespace

Bug: 33531483
Change-Id: I7e4d5b76d5dde42f2d1b2ad5079a5339a4d11f3d
Merged-In: Ia73e1e33b637d6ffd96ea0480ed6d85b9f68dce3

7 years agoMerge "Handle devices without quota, speed up lookup."
Jeff Sharkey [Tue, 17 Jan 2017 17:27:14 +0000 (17:27 +0000)]
Merge "Handle devices without quota, speed up lookup."
am: 36ba03a248

Change-Id: I38d4e01057e3cd65f4362056336294e8136df459