drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
337,106 Commits 1 Branch 0 Tags
Commit Graph

337106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
27140b03bf Merge "Delete all ro.hwui.* props" into oc-mr1-dev 
am: eb43cdbc2e

Change-Id: I4e3680df1f475bc6f15ff8c3ab0bdc8b887607a3
 2017-08-10 22:09:13 +00:00
John Reck
eb43cdbc2e Merge "Delete all ro.hwui.* props" into oc-mr1-dev 2017-08-10 21:57:02 +00:00
John Reck
20933d0454 Merge "SharedMemory API changes" into oc-mr1-dev 
am: edf3384307

Change-Id: Ib5f641f37e73fc6b236fe90c229bb3855025375c
 2017-08-10 19:53:25 +00:00
TreeHugger Robot
edf3384307 Merge "SharedMemory API changes" into oc-mr1-dev 2017-08-10 19:41:53 +00:00
Evan Rosky
becff025d7 Merge "Added focus behavior changes to Build.VERSION documentation." into oc-mr1-dev 
am: 003bd7e3ec

Change-Id: I8f7bc93c2eaab34ec2a84b4b1dde71ffb7ef5575
 2017-08-10 19:33:19 +00:00
Evan Rosky
003bd7e3ec Merge "Added focus behavior changes to Build.VERSION documentation." into oc-mr1-dev 2017-08-10 19:21:29 +00:00
Felipe Leme
9220ae8a2e Merge "CharSequenceTransformation should not change anything when comparision fails." into oc-mr1-dev 
am: 0edb324403

Change-Id: I2840d5d2fb5f71ad2f6dda8788e62c5343d0a65f
 2017-08-10 18:57:53 +00:00
TreeHugger Robot
0edb324403 Merge "CharSequenceTransformation should not change anything when comparision fails." into oc-mr1-dev 2017-08-10 18:48:55 +00:00
Hall Liu
6b3ce948c6 Merge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev 
am: d259d8b80f

Change-Id: I5abcbb619d38beb28be00f34a1ee3cffe351c721
 2017-08-10 18:29:19 +00:00
Hall Liu
d259d8b80f Merge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev 2017-08-10 18:20:47 +00:00
Ian Pedowitz
11e1da74a9 Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev am: 0716c8e60e 
am: 28440ed3b9  -s ours

Change-Id: I6d49a535724b9bc37405c37ae6246fa67004a6a3
 2017-08-10 18:07:59 +00:00
Android Build Merger (Role)
c31af92aa9 Merge "Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev am: 0716c8e60e -s ours am: c71be69f49 -s ours" into oc-mr1-dev-plus-aosp 2017-08-10 18:05:57 +00:00
Android Build Merger (Role)
d6fab9dae9 Merge "Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a354a am: 1cdd44bd9d am: 793c4be8d4" into oc-mr1-dev-plus-aosp 2017-08-10 18:00:58 +00:00
Ian Pedowitz
7dda553423 Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev am: 0716c8e60e -s ours 
am: c71be69f49  -s ours

Change-Id: I6f4601f905da7668bb204414e20815255e3fd481
 2017-08-10 17:58:24 +00:00
Amit Mahajan
3d9c4fa14f Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a354a am: 1cdd44bd9d 
am: 793c4be8d4

Change-Id: I4c7b7180fe9b56b5d7483f435a6d70530d89295f
 2017-08-10 17:54:12 +00:00
Android Build Merger (Role)
eacbe710dc Merge "Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 am: 1a808fc019 am: e1e32370e2" into oc-mr1-dev-plus-aosp 2017-08-10 17:53:26 +00:00
Ian Pedowitz
28440ed3b9 Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev 
am: 0716c8e60e

Change-Id: I1016361cd17be52a02a21fb4d1da791c0247be1d
 2017-08-10 17:46:32 +00:00
Beverly
ec3481b55d Merge "Low battery notification has unique sound." into oc-mr1-dev 
am: 9ac6be4a66

Change-Id: I3a2775b2e7292c56a3a5294df5da13974d99e168
 2017-08-10 17:46:21 +00:00
Amit Mahajan
e6a10f5b6a Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 am: 1a808fc019 
am: e1e32370e2

Change-Id: Ice6d00e2cdfc7b3afff23b3a64d50afc85a56830
 2017-08-10 17:46:01 +00:00
Ian Pedowitz
c71be69f49 Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev 
am: 0716c8e60e  -s ours

Change-Id: Iebfcbec5681f6b600c662ba1f3e705f10be79437
 2017-08-10 17:45:50 +00:00
TreeHugger Robot
9ac6be4a66 Merge "Low battery notification has unique sound." into oc-mr1-dev 2017-08-10 17:37:05 +00:00
Amit Mahajan
793c4be8d4 Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a354a 
am: 1cdd44bd9d

Change-Id: I8ed8d16910331f09a0e44e908e7ac89e990af141
 2017-08-10 17:34:07 +00:00
TreeHugger Robot
0716c8e60e Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev 2017-08-10 17:32:47 +00:00
Amit Mahajan
e1e32370e2 Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 
am: 1a808fc019

Change-Id: I27f67b172bd8096ee00b9c80bb9699b33eff97f7
 2017-08-10 17:27:24 +00:00
John Reck
642ebea6e1 Delete all ro.hwui.* props 
Remove all ro.hwui.* tuning props and instead
calculate them from the screen resolution.

Or just hardcode them to what all devices
were hardcoding them to anyway.

Bug: 63741221
Test: Check cache size results on sailfish

Change-Id: I8b0d210572a246f4fefb076935cf5156a70c274c
Merged-In: I8b0d210572a246f4fefb076935cf5156a70c274c
(cherry picked from commit 8dc02f99d09130ace2ee738c2e689db1b3f33181)
 2017-08-10 17:22:43 +00:00
Beverly
516be39336 Merge "Localization of zen mode default rules." into oc-mr1-dev 
am: 15ea142044

Change-Id: I28ad1c56e5bd1b9c7eec2cee336e22e5d7c0b6af
 2017-08-10 16:49:36 +00:00
TreeHugger Robot
15ea142044 Merge "Localization of zen mode default rules." into oc-mr1-dev 2017-08-10 16:41:36 +00:00
Amit Mahajan
1cdd44bd9d Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d 
am: cfbd4a354a

Change-Id: Ic5e764bd0d5ca14498c4b36dd1f2bd9d8ba05544
 2017-08-10 16:24:56 +00:00
Amit Mahajan
1a808fc019 Merge "Get isim card data use subId." am: 854edcff16 
am: 3466cda3d7

Change-Id: I84d8b0fd15e50706e59577941428e5f5e81fa373
 2017-08-10 16:20:16 +00:00
Amit Mahajan
cfbd4a354a Merge "The method of parseEfSpdi does not match TS24008." 
am: cd03d0db9d

Change-Id: I386f5e4de89c4ac758e1702b2efdc16a43c12c33
 2017-08-10 16:12:19 +00:00
Amit Mahajan
3466cda3d7 Merge "Get isim card data use subId." 
am: 854edcff16

Change-Id: I0a562f9966838cc6746c170b3bba9a250fd2633b
 2017-08-10 16:06:36 +00:00
Amit Mahajan
cd03d0db9d Merge "The method of parseEfSpdi does not match TS24008." 2017-08-10 15:59:43 +00:00
Amit Mahajan
854edcff16 Merge "Get isim card data use subId." 2017-08-10 15:57:38 +00:00
Ian Pedowitz
3608d5fad7 Revert "Initial support for proposed android.net.lowpan" 
This reverts commit 4e0c2195dd999859f4e79cec1884326fb52a5916.

Fixes: 64111427
Test: Grabbed OC CTS binaries
Test: Extracted android-cts.zip  and from android-cts/tools directory launched ./cts-tradefed
Test: On the DUT (running build which has this CL cherrypicked), ran the below (will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: Note, while b/64111427 is fixed, this uncovered b/64560640

Change-Id: I1d2132678281a917f03c69d5ead1d28313d7f46d
Merged-In: Icab67ba2c40bc02968e3f8ed2da5a4a3be6cf77f
 2017-08-10 08:56:41 -07:00
Narayan Kamath
9ed2834cba Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev 
am: 57ae4db225

Change-Id: I852a6b01c196240571aed51342fc5e2310c080d6
 2017-08-10 15:41:36 +00:00
Narayan Kamath
57ae4db225 Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev 2017-08-10 15:34:22 +00:00
Jeff Sharkey
aff3d6cf6b Merge "Fix handling of @removed APIs." into oc-mr1-dev 
am: 5cb2d64b9b

Change-Id: I1ac9843cc17efc4ea088e5738c38dcd2ad79e5c5
 2017-08-10 15:26:22 +00:00
Jeff Sharkey
5cb2d64b9b Merge "Fix handling of @removed APIs." into oc-mr1-dev 2017-08-10 15:18:58 +00:00
Narayan Kamath
590b90f533 ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8. 
Bug: 64493351
Test: cts-tradefed run cts-dev -t android.appsecurity.cts.ClassloaderSplitsTest -m CtsAppSecurityHostTestCases
Change-Id: Ib4868c1e0320002f5122193621e9ab56fe34819f
 2017-08-10 12:15:17 +01:00
Narayan Kamath
b51eae5825 Merge "PackageParser: Parse android:classLoader during the full parse." into oc-mr1-dev 
am: af706b40de

Change-Id: I8e761bf1c4afba4795aa4041aeabc66b48964030
 2017-08-10 11:14:20 +00:00
Narayan Kamath
af706b40de Merge "PackageParser: Parse android:classLoader during the full parse." into oc-mr1-dev 2017-08-10 11:04:40 +00:00
Android Build Merger (Role)
cb71e2217e Merge "Merge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe am: 365dad5b79" into oc-mr1-dev-plus-aosp 2017-08-10 07:05:51 +00:00
Justin Klaassen
ea45d50192 Merge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe 
am: 365dad5b79

Change-Id: I1e08211ccc567560905a72dee85b1b2f05b3440b
 2017-08-10 07:02:07 +00:00
Justin Klaassen
ec5db43567 Merge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe 
am: 3704bb0740

Change-Id: I75cf8daf594f2bff3acfb7ac7cb7992c578a62b7
 2017-08-10 07:02:04 +00:00
Justin Klaassen
3704bb0740 Merge "Remove config_demoModePackage resource" into oc-dr1-dev 
am: 934a1081fe

Change-Id: I31ce02bfd8c736d8e0d46173759558faf7a6cc2f
 2017-08-10 06:53:34 +00:00
Justin Klaassen
365dad5b79 Merge "Remove config_demoModePackage resource" into oc-dr1-dev 
am: 934a1081fe

Change-Id: I147f242ab2132a01c1e02ac00ac5123fa9a0a20a
 2017-08-10 06:53:33 +00:00
Shubang
5f68027506 Merge "Add permission check before setMain()" into oc-mr1-dev 
am: 67744e4696

Change-Id: I26ef67a44b8c041900958bd7a33097c6052c073a
 2017-08-10 06:47:35 +00:00
TreeHugger Robot
934a1081fe Merge "Remove config_demoModePackage resource" into oc-dr1-dev 2017-08-10 06:42:32 +00:00
TreeHugger Robot
67744e4696 Merge "Add permission check before setMain()" into oc-mr1-dev 2017-08-10 06:39:31 +00:00
Android Build Merger (Role)
7233f04d61 Merge "Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 256fe97329 am: 1e499641ce" into oc-mr1-dev-plus-aosp 2017-08-10 06:18:20 +00:00