OSDN Git Service
Fabien Sanglard [Thu, 2 Feb 2017 20:20:14 +0000 (20:20 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607
am:
f91ee50667
Change-Id: I703ffd6b2a4ee5a7726bd7426f83256ad990835f
Fabien Sanglard [Thu, 2 Feb 2017 20:18:12 +0000 (20:18 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2
am:
18a5e5f607
Change-Id: Iec4b5c921b77fd29aea45bdb49cd4d7cda67edc6
Fabien Sanglard [Thu, 2 Feb 2017 20:15:42 +0000 (20:15 +0000)]
Fix security vulnerability am:
45b202513b
am:
8778a131c2
Change-Id: Ic9300f2597702d6e83d80222dbc5ca7d2642f621
Fabien Sanglard [Thu, 2 Feb 2017 20:12:42 +0000 (20:12 +0000)]
Fix security vulnerability
am:
45b202513b
Change-Id: Ifaf692c814e2562332914854dc95c7715d37a5c0
Yifan Hong [Thu, 2 Feb 2017 19:44:51 +0000 (19:44 +0000)]
Merge "lshal: print pids of client processes." am:
1ca609d756
am:
9046024ef1
Change-Id: I74ab0b58d0edbb12283367143fd52be3dae4583c
Yifan Hong [Thu, 2 Feb 2017 19:39:42 +0000 (19:39 +0000)]
Merge "lshal: print pids of client processes."
am:
1ca609d756
Change-Id: Ide68ec1bc811d0ed3c23763bc1689d43282c6503
Treehugger Robot [Thu, 2 Feb 2017 19:32:48 +0000 (19:32 +0000)]
Merge "lshal: print pids of client processes."
Fabien Sanglard [Thu, 2 Feb 2017 01:59:36 +0000 (01:59 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e am:
40cd915a54 am:
ded5521871 am:
0e0a258771 am:
6a5a220b48
am:
30ab1434c3
Change-Id: Iaa4ffc3bca279f294a36df31823ec9a30a728fe7
Fabien Sanglard [Thu, 2 Feb 2017 01:57:08 +0000 (01:57 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e am:
40cd915a54 am:
ded5521871 am:
0e0a258771
am:
6a5a220b48
Change-Id: I47743cb142bdb4f21202dc51482fc52996f6b7a4
Fabien Sanglard [Thu, 2 Feb 2017 01:54:35 +0000 (01:54 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e am:
40cd915a54 am:
ded5521871
am:
0e0a258771
Change-Id: I4479a276592fc9d5d25378a5abee12473a2104ae
Fabien Sanglard [Thu, 2 Feb 2017 01:52:06 +0000 (01:52 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e am:
40cd915a54
am:
ded5521871
Change-Id: Ibf93b2a73caab87ee6c0b27234a8cdc05c0aa61e
Fabien Sanglard [Thu, 2 Feb 2017 01:49:06 +0000 (01:49 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e
am:
40cd915a54
Change-Id: Ib34c9d0e90e77565ab6d0d7fb805bb425964b5aa
Fabien Sanglard [Thu, 2 Feb 2017 01:46:34 +0000 (01:46 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a
am:
5ba227f96e
Change-Id: I9fc225ba640b4391d60380d7c588015c3e5516a7
Fabien Sanglard [Thu, 2 Feb 2017 01:43:34 +0000 (01:43 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32
am:
ebbf8a6b5a
Change-Id: Id8c91e714058b999805aa6da613a4343fecc1d6a
Fabien Sanglard [Thu, 2 Feb 2017 01:41:34 +0000 (01:41 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b
am:
cca3b79c32
Change-Id: I2e5da5ee33eb2757f360881e6ecc7dfd9fb67938
Fabien Sanglard [Thu, 2 Feb 2017 01:38:33 +0000 (01:38 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24
am:
c7892d9d0b
Change-Id: Ic59ba49542b907591f3e514ae0417ed82a5be7aa
Fabien Sanglard [Thu, 2 Feb 2017 01:36:33 +0000 (01:36 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef
am:
3995674f24
Change-Id: I979af2b40c8ee1b3820204cee5fa7e21e4906bf9
Fabien Sanglard [Thu, 2 Feb 2017 01:34:03 +0000 (01:34 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f
am:
132d0f2aef
Change-Id: If2aa999ec1f261ea34a6aa725241ea50226083ad
Fabien Sanglard [Thu, 2 Feb 2017 01:31:32 +0000 (01:31 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834
am:
ac2b87ac0f
Change-Id: I3b249a9ec1820917dc015c72bd093535927c9ed6
Fabien Sanglard [Thu, 2 Feb 2017 01:29:02 +0000 (01:29 +0000)]
Fix security vulnerability am:
2ae83f4f62
am:
11ab583834
Change-Id: I09ec85b9f83e1f4458940415cd07f6fca725c552
Fabien Sanglard [Thu, 2 Feb 2017 01:27:03 +0000 (01:27 +0000)]
Fix security vulnerability
am:
2ae83f4f62
Change-Id: Ie0590dbb8429b5b289f3095055abdc8d29b95a7f
Yifan Hong [Wed, 1 Feb 2017 23:54:01 +0000 (15:54 -0800)]
lshal: print pids of client processes.
Bug:
34777099
Bug:
34861460
Test: lshal
Test: NFC / light / audio with and without persistent.hal.binderized;
run lshal to reflect this.
Change-Id: I50aa5d99fb14957b1e40a405836e68c235a22006
Yifan Hong [Wed, 1 Feb 2017 21:24:49 +0000 (21:24 +0000)]
Merge "Do not -1 for lshal." am:
50752b732e
am:
bd4cc238fb
Change-Id: I1dd676e1d50b68913578890c5d5096a8d81480b9
Yifan Hong [Wed, 1 Feb 2017 21:20:38 +0000 (21:20 +0000)]
Merge "Do not -1 for lshal."
am:
50752b732e
Change-Id: I8e0f285f5b17b11f32b504dda3a4c31da770653f
Treehugger Robot [Wed, 1 Feb 2017 21:15:42 +0000 (21:15 +0000)]
Merge "Do not -1 for lshal."
Evgenii Stepanov [Wed, 1 Feb 2017 19:31:10 +0000 (19:31 +0000)]
Merge "Disable integer sanitization on host." am:
b79d9f9d49
am:
e81efc5036
Change-Id: Ifc9e92b6c39b9dc08066f051da263171bef1ee06
Evgenii Stepanov [Wed, 1 Feb 2017 19:28:31 +0000 (19:28 +0000)]
Merge "Disable integer sanitization on host."
am:
b79d9f9d49
Change-Id: I517a019007bcf12b0884c22234abf25482d50cca
Evgenii Stepanov [Wed, 1 Feb 2017 19:24:10 +0000 (19:24 +0000)]
Merge "Disable integer sanitization on host."
George Burgess IV [Wed, 1 Feb 2017 07:22:02 +0000 (07:22 +0000)]
Merge "Fix a use-of-uninitialized-value warning" am:
d047e10558
am:
f9e9c5bc2e
Change-Id: Iff659ffdf206f94e88fcec2a27a1518357fecead
George Burgess IV [Wed, 1 Feb 2017 07:13:44 +0000 (07:13 +0000)]
Merge "Fix a use-of-uninitialized-value warning"
am:
d047e10558
Change-Id: I4bd31c59331b6ef26e36bfff3fe57becf9b5ecc2
Treehugger Robot [Wed, 1 Feb 2017 07:09:50 +0000 (07:09 +0000)]
Merge "Fix a use-of-uninitialized-value warning"
Yifan Hong [Tue, 31 Jan 2017 23:54:39 +0000 (15:54 -0800)]
Do not -1 for lshal.
Test: compiles
Change-Id: I99e6306a6b82ec85bc84f9572f3e4f2f8cdf2847
George Burgess IV [Wed, 1 Feb 2017 03:33:00 +0000 (03:33 +0000)]
Merge "Fix -Wdouble-promotion warnings" am:
7920557287
am:
f2528e2dad
Change-Id: I002b3954932af2c13b81b6f5d2e46b157f730e1e
George Burgess IV [Wed, 1 Feb 2017 03:21:30 +0000 (03:21 +0000)]
Merge "Fix -Wdouble-promotion warnings"
am:
7920557287
Change-Id: I2b7a8f6c24990220f90cb3d2f9221228ec330be5
Treehugger Robot [Wed, 1 Feb 2017 03:14:59 +0000 (03:14 +0000)]
Merge "Fix -Wdouble-promotion warnings"
Evgenii Stepanov [Wed, 1 Feb 2017 00:37:44 +0000 (16:37 -0800)]
Disable integer sanitization on host.
Test: NFC until https://android-review.googlesource.com/#/c/329510
Change-Id: I0183556d5b945c689934664fe7f15caa18a0997d
George Burgess IV [Wed, 1 Feb 2017 00:21:25 +0000 (16:21 -0800)]
Fix a use-of-uninitialized-value warning
Caught by clang's static analyzer:
frameworks/base/core/jni/com_google_android_gles_jni_GLImpl.cpp:190:30:
warning: The right operand of '+' is a garbage value
buf = (char*)buf + offset;
This is because getPointer doesn't always set `offset` to a value. We
could fix it locally by initializing `offset`, but it seems to be less
error-prone to just fix getPointer instead.
Bug: None
Test: Still builds; warning is now gone.
Change-Id: I90bea0c94cf8d7f92a0d9a4db4e64e7e563bfb09
George Burgess IV [Tue, 31 Jan 2017 03:35:13 +0000 (03:35 +0000)]
Merge "Add permission bits to open calls with O_CREAT" am:
9dc2e6bc43
am:
3e240c81be
Change-Id: Id28d9cdc5b4862b7c62b4d5dd2da6fde13f8dd9c
George Burgess IV [Tue, 31 Jan 2017 03:32:44 +0000 (03:32 +0000)]
Merge "Add permission bits to open calls with O_CREAT"
am:
9dc2e6bc43
Change-Id: Ifa1d1607751dc89cb341a97c1b737bf2ee7bc260
Treehugger Robot [Tue, 31 Jan 2017 03:29:05 +0000 (03:29 +0000)]
Merge "Add permission bits to open calls with O_CREAT"
George Burgess IV [Wed, 25 Jan 2017 19:36:12 +0000 (11:36 -0800)]
Add permission bits to open calls with O_CREAT
Open needs a third argument if you pass it O_CREAT:
https://linux.die.net/man/3/open
This turns into a compile-time error with FORITFY, so we need this fixed
before our unbroken FORTIFY can go in.
(The TEMP_FAILURE_RETRY open isn't detected by clang FORTIFY, but I
noticed that open_reference_profile potentially passes in O_CREAT as an
open_flag.)
Bug:
32073964
Test: Now builds with clang FORTIFY; CtsCompilationTestCases passes;
manually verified that /data/misc/profiles/ref/*/primary.prof has rw
permissions after a successful `cmd package compile -m speed-profile`.
Change-Id: Ie707d5ad403d2f86c769277b3e0f147c45000a6b
George Burgess IV [Thu, 26 Jan 2017 20:33:01 +0000 (20:33 +0000)]
Merge "Replace strlen with arraysize in array bounds." am:
70a5f12045
am:
5f186d057a
Change-Id: Ic23f22a26e160055c2e50eb9641183c0da9dfc2a
George Burgess IV [Thu, 26 Jan 2017 20:26:56 +0000 (20:26 +0000)]
Merge "Replace strlen with arraysize in array bounds."
am:
70a5f12045
Change-Id: I3357cadb32858a94d94c6b4bd82fe69f241027b4
Treehugger Robot [Thu, 26 Jan 2017 20:06:50 +0000 (20:06 +0000)]
Merge "Replace strlen with arraysize in array bounds."
George Burgess IV [Wed, 25 Jan 2017 21:33:38 +0000 (13:33 -0800)]
Fix -Wdouble-promotion warnings
With the new clang FORTIFY, this code emits the following error:
error: implicit conversion increases floating-point precision: 'float'
to 'double' [-Werror,-Wdouble-promotion]
This is because strncpy is now a function, not a macro defined in a
system header. So, the warning is considered to appear in user code
(instead of system code), and is therefore no longer suppressed.
Bug:
32073964
Test: Now builds with clang FORTIFY
Change-Id: Id5fcfe91755535f90b542e11bc42b66976fe24fc
Merged-In: I5e8292d7800434268793bc4db4a96f20b7022e17
George Burgess IV [Wed, 25 Jan 2017 19:52:01 +0000 (11:52 -0800)]
Replace strlen with arraysize in array bounds.
clang-FORTIFY doesn't let us evaluate strlen("foo") as a constant
expression that can be used in static array bounds. Instead, we'd need
to either do __builtin_strlen("foo") or arraysize("foo") - 1. Just use
arraysize here, since the extra 1 byte per array isn't likely to be a
terrible thing.
Happy to swap to __builtin_strlen if anyone cares deeply enough.
Bug:
32073964
Test: Now builds with clang FORTIFY.
Change-Id: I4c9b3eb74775901554b939246722bd3a22326d10
Yifan Hong [Thu, 26 Jan 2017 18:27:25 +0000 (18:27 +0000)]
Merge changes from topic 'lshal' am:
1f2d5a9cda
am:
65b5fab397
Change-Id: If32d7c1459710e4f584be7740e8de785337dd54b
Yifan Hong [Thu, 26 Jan 2017 18:26:07 +0000 (18:26 +0000)]
Add debugDump() to IServiceManager. am:
5ccdab9bc5
am:
169161171c
Change-Id: I570c0d3f712dd8069d14fdae37c587ebcfd99229
Yifan Hong [Thu, 26 Jan 2017 18:25:56 +0000 (18:25 +0000)]
Add an lshal command. am:
85dd3ad89f
am:
a763ae7121
Change-Id: I627e16e1216e09dccbc96db26dfba844e073d403
Yifan Hong [Thu, 26 Jan 2017 18:24:44 +0000 (18:24 +0000)]
Merge changes from topic 'lshal'
am:
1f2d5a9cda
Change-Id: If2ed2950dfa6f7a4598e143e9e22b34426a8f196
Yifan Hong [Thu, 26 Jan 2017 18:23:12 +0000 (18:23 +0000)]
Add debugDump() to IServiceManager.
am:
5ccdab9bc5
Change-Id: I4823ca88072ebe167fa6a3b894cad610cea88c94
Yifan Hong [Thu, 26 Jan 2017 18:23:02 +0000 (18:23 +0000)]
Add an lshal command.
am:
85dd3ad89f
Change-Id: I43be1cd548f30d7d6e954411fc3db8b13e20f3c0
Yifan Hong [Thu, 26 Jan 2017 18:18:19 +0000 (18:18 +0000)]
Merge changes from topic 'lshal'
* changes:
Add debugDump() to IServiceManager.
Add an lshal command.
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
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
Treehugger Robot [Thu, 26 Jan 2017 17:37:23 +0000 (17:37 +0000)]
Merge "Fix two bugs in external storage accounting."
Yifan Hong [Thu, 26 Jan 2017 06:53:37 +0000 (22:53 -0800)]
Add debugDump() to IServiceManager.
Test: mma
Change-Id: I04289500c7ee42a84d3593b4c0e45a0b829370a7
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
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:
27948817,
30927649
Change-Id: Ic3cbf387cf119aa82af6e380bde9d9b069f6bfb0
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
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
Treehugger Robot [Thu, 26 Jan 2017 01:25:52 +0000 (01:25 +0000)]
Merge "Add 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
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
Stephen Hines [Tue, 24 Jan 2017 01:20:04 +0000 (01:20 +0000)]
Merge "Properly align a packed structure."
am:
24257dda48
Change-Id: I66d07aab4dfa72afe44270d866514102f660aab6
Treehugger Robot [Tue, 24 Jan 2017 01:15:06 +0000 (01:15 +0000)]
Merge "Properly align a packed structure."
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
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
Treehugger Robot [Mon, 23 Jan 2017 18:20:51 +0000 (18:20 +0000)]
Merge "Update atrace to work with tracefs, not debugfs"
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
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
Treehugger Robot [Sat, 21 Jan 2017 21:11:50 +0000 (21:11 +0000)]
Merge "dumpsys: 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
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
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
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
Jeff Sharkey [Fri, 20 Jan 2017 22:45:03 +0000 (22:45 +0000)]
Merge "Add Binder support for Parcelable exceptions."
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
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
Treehugger Robot [Fri, 20 Jan 2017 20:07:13 +0000 (20:07 +0000)]
Merge "Add i2c tracing support to atrace"
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
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
Treehugger Robot [Fri, 20 Jan 2017 19:55:15 +0000 (19:55 +0000)]
Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers"
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
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
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
Jeff Sharkey [Thu, 19 Jan 2017 22:00:50 +0000 (22:00 +0000)]
Merge "Measure external storage using new GIDs."
Fabien Sanglard [Thu, 19 Jan 2017 19:13:20 +0000 (11:13 -0800)]
Fix security vulnerability
Test: hammerhead
Bug:
32628763
Change-Id: I19a81b63fffee8f323a5925c7e8633fbd640b91c
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
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:
27948817,
34263266
Change-Id: Ife087df299ff8ee1a75fce1e39b4b737cf9375d5
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
Jeff Sharkey [Thu, 19 Jan 2017 16:16:02 +0000 (16:16 +0000)]
Merge "First pass at updated cache clearing logic."
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
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
Peng Xu [Thu, 19 Jan 2017 01:11:49 +0000 (01:11 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
Fabien Sanglard [Thu, 19 Jan 2017 00:43:18 +0000 (16:43 -0800)]
Fix security vulnerability
Change-Id: I4c9ea3a3177131fa29d2561da71ef18bec3af108
Test: angler, marlin
Bug:
32628763
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
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
Calin Juravle [Wed, 18 Jan 2017 23:49:13 +0000 (23:49 +0000)]
Merge "Clean up and simplify the logic in dexopt"
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
OSDN Git Service
