Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
283,315 Commits 3 Branches 0 Tags
09b336febd1925fe52bb4268b29902712e660d27
Commit Graph

283315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
09b336febd Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b am: 86f242b071 am: d491410316" into nyc-mr2-dev-plus-aosp 2017-02-12 10:21:37 +00:00
Jeff Sharkey
4f86c07a3e DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b am: 86f242b071 
am: d491410316

Change-Id: If549125c9057964da34ab178af08e926962dd1d5
 2017-02-12 10:20:52 +00:00
Jeff Sharkey
ce567aa642 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b am: 86f242b071 
am: 5b49be4488

Change-Id: I576f71a635e1d1da44506b4e10ea7d915f5e7ba5
 2017-02-12 10:20:41 +00:00
Jeff Sharkey
d491410316 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b 
am: 86f242b071

Change-Id: Iaf37416af9d8d3e31b1825719f2f0cc8e860a603
 2017-02-12 10:16:12 +00:00
Jeff Sharkey
5b49be4488 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b 
am: 86f242b071

Change-Id: Iec17b7e2b1dcc972951e71d3c0d9e12d03440e88
 2017-02-12 10:16:12 +00:00
Jeff Sharkey
86f242b071 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 
am: c7b754f62b

Change-Id: Icc3179df0206649ca412eb3cb4a8b5a4691718fb
 2017-02-12 10:12:11 +00:00
Jeff Sharkey
c7b754f62b DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 
am: 853e178de4

Change-Id: I7adf093b7b09d6cc69e13f17865f754ccf327200
 2017-02-12 10:08:11 +00:00
Jeff Sharkey
853e178de4 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours 
am: deea677359

Change-Id: I579175736bf9c3839492e67d08b8ce765c85c121
 2017-02-12 10:04:10 +00:00
Jeff Sharkey
deea677359 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 
am: 502ee22a9d  -s ours

Change-Id: Ibb1a72ca35121ba586f18852445941b0a0c15724
 2017-02-12 10:00:37 +00:00
Jeff Sharkey
502ee22a9d DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c 
am: 75f767afa1

Change-Id: I1393b6bcfa074bef42b7491204df55e39471e689
 2017-02-12 09:56:10 +00:00
Jeff Sharkey
75f767afa1 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 
am: 32c71b078c

Change-Id: I1af83dbf9869bd93ecc5c07e1ce6155206f73290
 2017-02-12 09:51:37 +00:00
Jeff Sharkey
32c71b078c DO NOT MERGE. Grant MMS Uri permissions as the calling UID. 
am: 3f3da42ef9

Change-Id: I222c32931827d906db5fc1e3258f2095e6013481
 2017-02-12 09:47:33 +00:00
Paul Stewart
edb9b8df23 Merge "Allow EAP-SIM authentication methods under PEAP" am: e690e0178c am: 549c3fc0da 
am: bdfb1b86d3

Change-Id: I083778d8867e79b1a2c04166811508a6642a9c68
 2017-02-11 02:52:44 +00:00
Paul Stewart
bdfb1b86d3 Merge "Allow EAP-SIM authentication methods under PEAP" am: e690e0178c 
am: 549c3fc0da

Change-Id: I35592cd0e25bf459505c0a2008b7fe1f3be6298c
 2017-02-11 02:48:31 +00:00
Paul Stewart
549c3fc0da Merge "Allow EAP-SIM authentication methods under PEAP" 
am: e690e0178c

Change-Id: I3f61bdd86c97210acd14b6d2d30e44e26c8b1085
 2017-02-11 02:43:38 +00:00
Treehugger Robot
e690e0178c Merge "Allow EAP-SIM authentication methods under PEAP" 2017-02-11 02:34:51 +00:00
Mark Goldstein
31ecb52860 Update the exception description for start(). am: ac06177a13 am: 8b137cc06b 
am: 539e1bab4d

Change-Id: I1274412a79c59da1a76f0b54f8633d9a2ec02d34
 2017-02-11 01:41:37 +00:00
Mark Goldstein
673a2df291 Update the exception description for start(). am: ac06177a13 am: 8b137cc06b 
am: fd88989486

Change-Id: I9fef1f2ba9ca5db9b46ea67e2507a682b249c595
 2017-02-11 01:38:34 +00:00
Mark Goldstein
fd88989486 Update the exception description for start(). am: ac06177a13 
am: 8b137cc06b

Change-Id: Id448ab164e1fd0d3f5977c30c5395bcb6e87f90f
 2017-02-11 01:34:35 +00:00
Mark Goldstein
539e1bab4d Update the exception description for start(). am: ac06177a13 
am: 8b137cc06b

Change-Id: I4fcbc9b93ce8e908810d6c8eb4f0dd06c471ed3a
 2017-02-11 01:34:30 +00:00
Mark Goldstein
8b137cc06b Update the exception description for start(). 
am: ac06177a13

Change-Id: I124d99971918daa7768d79daa01ecbbb86f60199
 2017-02-11 01:29:27 +00:00
Jesse Hall
516274249f resolve merge conflicts of b3a1417663 to nyc-mr2-dev-plus-aosp 
Test: mmma frameworks/base
Change-Id: I2e1e04f55d05fd8aa33da304bdb951713b37793c
 2017-02-10 17:15:15 -08:00
Paul Stewart
e613fccb56 Allow EAP-SIM authentication methods under PEAP 
Extend the PEAP outer method to contain EAP-SIM innner methods
so these transactions can be encrypted.

Cherry-pick of 68c63024c2

Bug: 34835771
Test: Unit tests

Change-Id: I4931ed43e396c93bad0bfce1750291982f8cd146
 2017-02-10 16:15:52 -08:00
Paul Lawrence
6c1238699b Merge "Expand seccomp whitelist" am: c6c11723cb am: 3b9c0fadda 
am: 507c3fb099

Change-Id: Idcdec4c87b2ad5f91cbe05874ea532139fe38d42
 2017-02-10 21:28:56 +00:00
Paul Lawrence
507c3fb099 Merge "Expand seccomp whitelist" am: c6c11723cb 
am: 3b9c0fadda

Change-Id: I50851e4d3c92d53562e593be0b82c09709262d4a
 2017-02-10 21:22:25 +00:00
Mark Goldstein
ac06177a13 Update the exception description for start(). 
Bug: 31592353
Change-Id: Ic325a8004a87b71c0b43d02db58d4717b4b3831d
 2017-02-10 13:22:24 -08:00
Paul Lawrence
3b9c0fadda Merge "Expand seccomp whitelist" 
am: c6c11723cb

Change-Id: I73a7ede13a35354a08e1bc3301f624295373cd52
 2017-02-10 21:17:14 +00:00
Treehugger Robot
c6c11723cb Merge "Expand seccomp whitelist" 2017-02-10 21:08:07 +00:00
Jesse Hall
b3a1417663 Zygote: Restore GL preload 
Preloading GLES drivers in Zygote was removed previously since it is
incompatible with updatable drivers. That caused some app startup
latency and system memory use regressions. This change re-adds GLES
driver preloading, but only on devices that don't support driver
updates.

Bug: 34611670
Bug: 35052548
Test: boot angler, systrace of Calculator app startup
Change-Id: Ibdc6b3c0ba4473574722641d4bfad4b375f908a3
(cherry picked from commit ba0370eef3)
 2017-02-10 12:59:10 -08:00
Yifan Hong
229e2d09ce Merge "android.os.HwBinder.getService() in Java respects VINTF." am: 01f374c635 am: 71e77c865b 
am: 2e943c5379

Change-Id: Ibbf18bc51e146abef1ab211614a98ec59031b1b9
 2017-02-10 18:53:07 +00:00
Yifan Hong
2e943c5379 Merge "android.os.HwBinder.getService() in Java respects VINTF." am: 01f374c635 
am: 71e77c865b

Change-Id: I37c99d5135046c6b0d2589f321cd8e4b235392e7
 2017-02-10 18:48:14 +00:00
Alan Viverette
07a6ff6989 Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev 
am: 41023417e7

Change-Id: I4e42386e1f227e2cb48bf37eb05bcf7f81b6d709
 2017-02-10 18:43:47 +00:00
Yifan Hong
71e77c865b Merge "android.os.HwBinder.getService() in Java respects VINTF." 
am: 01f374c635

Change-Id: I1db3c946211861e6edd7c03d9eaeae7a0cb412c4
 2017-02-10 18:43:37 +00:00
Paul Lawrence
39139358e5 Expand seccomp whitelist 
Bug: 34763393
Test: cts test android.os.cts.SeccompTest now passes
Change-Id: I8907074485395015a03119700543ff33fdd8e214
 2017-02-10 10:42:07 -08:00
TreeHugger Robot
41023417e7 Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev 2017-02-10 18:35:37 +00:00
Yifan Hong
01f374c635 Merge "android.os.HwBinder.getService() in Java respects VINTF." 2017-02-10 18:33:42 +00:00
Android Build Merger (Role)
90629b8789 Merge "Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9 am: f85a20702a am: 0f2c853889" into nyc-mr2-dev-plus-aosp 2017-02-10 12:33:40 +00:00
Rubin Xu
5d1aa36475 Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9 am: f85a20702a 
am: 0f2c853889

Change-Id: Icfdd2a6027c75e43c78f85109341ae088102548b
 2017-02-10 12:32:57 +00:00
Rubin Xu
6ee5a0c8a5 Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9 am: f85a20702a 
am: 060cde9802

Change-Id: Ic591b48e298823b46f8d1fc25b0e01a82cc263b5
 2017-02-10 12:32:48 +00:00
Rubin Xu
060cde9802 Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9 
am: f85a20702a

Change-Id: I3861a5229fdb55f7dc7fd57e1706b34f9847d492
 2017-02-10 12:28:56 +00:00
Rubin Xu
0f2c853889 Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9 
am: f85a20702a

Change-Id: If9e569ba66dc9e5876fab5ffd2a6c9b0a9fb923b
 2017-02-10 12:28:47 +00:00
Rubin Xu
f85a20702a Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce 
am: 72074e3ab9

Change-Id: I1cd4db65e0fe8c92628f22f94fe937cf64f2da04
 2017-02-10 12:24:43 +00:00
Rubin Xu
72074e3ab9 Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 
am: 824c8284ce

Change-Id: If4dfa2d7af980c91ec3d3f8faa7e7f4a39350c82
 2017-02-10 12:20:18 +00:00
Rubin Xu
824c8284ce Merge "Fix uri permission grant on remote bug report uri" into nyc-dev 
am: 42f2e80293

Change-Id: Ic167e10a205b5c8f9df81cd20a6f08359d3807f4
 2017-02-10 12:16:19 +00:00
TreeHugger Robot
42f2e80293 Merge "Fix uri permission grant on remote bug report uri" into nyc-dev 2017-02-10 12:11:00 +00:00
Sooraj Sasindran
186c0839d8 Merge "Expose api to retrieve wakelock information per client" am: 8fbf6a29d0 am: 730c2d9c72 -s ours 
am: bae8d7a8c4  -s ours

Change-Id: I352f7dc305e64fa5e82bd3cccd9015732ab54504
 2017-02-10 05:57:13 +00:00
Sooraj Sasindran
bae8d7a8c4 Merge "Expose api to retrieve wakelock information per client" am: 8fbf6a29d0 
am: 730c2d9c72  -s ours

Change-Id: I17a8dfcf0be71bcb667e70bab2834f0b7fd42b3c
 2017-02-10 05:50:12 +00:00
Sooraj Sasindran
730c2d9c72 Merge "Expose api to retrieve wakelock information per client" 
am: 8fbf6a29d0

Change-Id: I1ca7d53b256333170b849cb1103c8b3ca0e76e0b
 2017-02-10 05:45:05 +00:00
Sooraj Sasindran
8fbf6a29d0 Merge "Expose api to retrieve wakelock information per client" 2017-02-10 05:38:41 +00:00
Sooraj Sasindran
4c8fc962dc Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp 
am: cbbf530125

Change-Id: Id5ea5536246343a530f7579a31039421b3859de3
 2017-02-10 03:03:38 +00:00