Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
344,029 Commits 3 Branches 0 Tags
ff6fcaec0ba0fa66cdabb8ec33db5cd66c9428e1
Commit Graph

344029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
ff6fcaec0b Merge "Make services.core the final priorityboosted jar" am: a0c1780d3c 
am: 93de069ec9

Change-Id: Ib1a626060f2e2d617ca0b51e016cc7e06cae27d8
 2017-12-13 20:43:20 +00:00
Colin Cross
93de069ec9 Merge "Make services.core the final priorityboosted jar" 
am: a0c1780d3c

Change-Id: I4969cd15085ab460a112547e63362bf8c2bc1602
 2017-12-13 20:33:28 +00:00
Colin Cross
a0c1780d3c Merge "Make services.core the final priorityboosted jar" 2017-12-13 20:16:19 +00:00
Dan Albert
83a1241e5a Merge "Include what we use." am: b0efcc1f68 
am: afa15b0846

Change-Id: I1f4ba5196d1118cfcd68821fa8ac0fbd17d8b5fc
 2017-12-13 20:07:04 +00:00
Dan Albert
afa15b0846 Merge "Include what we use." 
am: b0efcc1f68

Change-Id: Ic75bda75c80be19ee7f0f865ffd9e4f8c70fe785
 2017-12-13 19:52:11 +00:00
Treehugger Robot
b0efcc1f68 Merge "Include what we use." 2017-12-13 19:38:38 +00:00
Dmitry Shmidt
7818322b62 Merge "renderthread: relax error handling for wide gamut EGL configs" am: 50666fa217 
am: c1ad3c5f29

Change-Id: I81a582d7ad20f062803963a3dc43ddcec288c8ec
 2017-12-13 18:16:43 +00:00
Dmitry Shmidt
c1ad3c5f29 Merge "renderthread: relax error handling for wide gamut EGL configs" 
am: 50666fa217

Change-Id: Ic97b3742278bcdb2b5ec7b0540a7f7252c5472a4
 2017-12-13 18:04:19 +00:00
Dmitry Shmidt
50666fa217 Merge "renderthread: relax error handling for wide gamut EGL configs" 2017-12-13 17:51:47 +00:00
Rob Herring
4ee4d20908 renderthread: relax error handling for wide gamut EGL configs 
It is valid to advertise EGL_EXT_pixel_format_float, but not have a
the requested EGL config. Instead of aborting, fallback to the default
behavior.

Change-Id: I6c602233b627dc2070364434fece57d3d0aab435
Cc: Romain Guy <romainguy@google.com>
Signed-off-by: Rob Herring <robh@kernel.org>
 2017-12-13 14:30:21 +00:00
Jack Yu
8b325a0654 Merge "Added test cases for DataCallResponse parcel read/write" am: 125d736bbe 
am: 06bf4f618c

Change-Id: I0fb9abd42aa9b995c76969a12b52eb6795acafb2
 2017-12-13 09:51:27 +00:00
Jack Yu
06bf4f618c Merge "Added test cases for DataCallResponse parcel read/write" 
am: 125d736bbe

Change-Id: I9b2bd725ddaa40513747e368553c918899987d2f
 2017-12-13 09:42:49 +00:00
Treehugger Robot
125d736bbe Merge "Added test cases for DataCallResponse parcel read/write" 2017-12-13 09:29:25 +00:00
Jack Yu
56926dd7e5 Added test cases for DataCallResponse parcel read/write 
bug: 64132030
Test: Unit tests
Merged-In: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
Change-Id: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
(cherry picked from commit 14c2aaa0a2)
 2017-12-13 00:10:51 -08:00
Colin Cross
4c0b06b7ed Make services.core the final priorityboosted jar 
Other module besides services depend on services.core, and after
I417409281c928ea667d937090d2a0d9d72a449a2 they were getting
the non-priorityboosted version of the jar.  Make services.core
a java_library that contains the output of the priorityboosting
java_genrule.

Test: m services
Change-Id: Ic9ca1b8f43f87b0d7d36b53bbc5136a331490c3e
 2017-12-12 19:43:04 -08:00
Eric Erfanian
c73edfa2c6 Merge "Add assisted dialing properties to the framework." am: f5bec0d781 
am: 1d9fc9a490

Change-Id: I176ce86a83406d2eecd33cf439085fcc13703a27
 2017-12-13 02:21:36 +00:00
Hemant Gupta
3a670c3c04 Merge "Bluetooth: Add support for PBAP UI preference" am: 045d34ce76 
am: cbfae42c3c

Change-Id: I16d491889a4877e6b5b9e602f29d35f83063cf61
 2017-12-13 01:56:18 +00:00
Colin Cross
cfd06fdc14 Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am: 9a3132d065 
am: 4b7a6339cf

Change-Id: Ie2e2704b0de42b4eef032ad6bdca0f0e114bdd3e
 2017-12-13 01:51:09 +00:00
Eric Erfanian
1d9fc9a490 Merge "Add assisted dialing properties to the framework." 
am: f5bec0d781

Change-Id: Ic4c118892b964e51136fb730070f2a6b6167b212
 2017-12-13 01:46:02 +00:00
Colin Cross
39e11f5255 Merge "Remove unused target android.test.mock.sdk" am: a4c0fa769a 
am: 9d78e84a8e

Change-Id: Ie20f03c260883345171871196284f4dc2b6d06cd
 2017-12-13 01:43:52 +00:00
Hemant Gupta
cbfae42c3c Merge "Bluetooth: Add support for PBAP UI preference" 
am: 045d34ce76

Change-Id: I21f59d9a7df98f37009e730acaf63938304e3af2
 2017-12-13 01:26:35 +00:00
Colin Cross
4b7a6339cf Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" 
am: 9a3132d065

Change-Id: I6a71d49ae1cc7f3cd5b65c523e3e64b3a882e4da
 2017-12-13 01:20:42 +00:00
Colin Cross
a5e61f3249 Merge "Separate android.test.mock from test-runner source" am: d330eeeeda 
am: 78160c2577

Change-Id: Ibaad59f9c605f1c9ae02a4b63f7c01e6b508f55d
 2017-12-13 01:18:14 +00:00
Colin Cross
9d78e84a8e Merge "Remove unused target android.test.mock.sdk" 
am: a4c0fa769a

Change-Id: I4ff49776db15ff17449ac615cefd3d2c5e3d2465
 2017-12-13 01:11:46 +00:00
Colin Cross
0688ef8668 Merge "Convert services to Android.bp" am: 5319777274 
am: b8500d4771

Change-Id: Idcfeb088fa73e679d18de2ce2dc2ba58cdc78af7
 2017-12-13 01:08:56 +00:00
Colin Cross
78160c2577 Merge "Separate android.test.mock from test-runner source" 
am: d330eeeeda

Change-Id: I7d578d55332942f8e3cdc7b44dc10b31cafc4174
 2017-12-13 00:57:59 +00:00
Jack He
061bc75d49 Merge "Bluetooth: Add convenience method to convert connection state to string" am: f7a69aeeab 
am: c57c5a9ba4

Change-Id: Id9b238bb2493455650351d595e4c7d2dd5005f2e
 2017-12-13 00:45:58 +00:00
Treehugger Robot
f5bec0d781 Merge "Add assisted dialing properties to the framework." 2017-12-13 00:38:42 +00:00
Colin Cross
b8500d4771 Merge "Convert services to Android.bp" 
am: 5319777274

Change-Id: I41a44a2684fa322039d3979a663aa4b4e0ef73d7
 2017-12-13 00:38:41 +00:00
Treehugger Robot
045d34ce76 Merge "Bluetooth: Add support for PBAP UI preference" 2017-12-13 00:30:42 +00:00
Dan Albert
9b6a62f94c Include what we use. 
Test: mma
Bug: None
Change-Id: I9458aedad9a84f1660d3a2b08717b111dc8e3b74
Exempt-From-Owner-Approval: trivial cleanup
 2017-12-12 16:08:11 -08:00
Jack He
c57c5a9ba4 Merge "Bluetooth: Add convenience method to convert connection state to string" 
am: f7a69aeeab

Change-Id: I6be2177bcc81cd16824fc20b2dbf7a8a6c9464b8
 2017-12-13 00:02:25 +00:00
Adam Lesinski
6036449709 Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev 
am: a06854e77a

Change-Id: I9d4f214b3911fb66fd2baa8ad83e8450246c3c80
 2017-12-12 23:36:57 +00:00
Colin Cross
9a3132d065 Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" 2017-12-12 23:27:15 +00:00
Colin Cross
a4c0fa769a Merge "Remove unused target android.test.mock.sdk" 2017-12-12 23:26:41 +00:00
Colin Cross
d330eeeeda Merge "Separate android.test.mock from test-runner source" 2017-12-12 23:25:48 +00:00
Colin Cross
5319777274 Merge "Convert services to Android.bp" 2017-12-12 23:25:09 +00:00
Colin Cross
fc7ba9e61f Convert legacy-test, test-runner, and test-mock to Android.bp 
See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: I110f752d2fa94c44581f20d4f308d9d429da0517
Merged-In: I110f752d2fa94c44581f20d4f308d9d429da0517
(cherry-picked from commit 2b7d71c7f8)
 2017-12-12 23:24:40 +00:00
Paul Duffin
c161308984 Remove unused target android.test.mock.sdk 
Bug: 30188076
Test: make checkbuild

Change-Id: I9b613969425e6c4d8700f6275484d6452a3cc3af
Merged-In: I9b613969425e6c4d8700f6275484d6452a3cc3af
(cherry picked from commit 10d0658bf0)
 2017-12-12 23:24:18 +00:00
Paul Duffin
69516f4df7 Separate android.test.mock from test-runner source 
Extracts the source for the android.test.mock library from the
frameworks/base/test-runner directory into its own
frameworks/base/test-mock directory. They are already treated separately
at runtime and compile time so this just makes the separation complete.

Bug: 30188076
Test: make checkbuild
Change-Id: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
Merged-In: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
(cherry picked from commit e254526f0f)
 2017-12-12 23:23:31 +00:00
Colin Cross
eb652a47a1 Convert services to Android.bp 
See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: I417409281c928ea667d937090d2a0d9d72a449a2
Merged-In: I417409281c928ea667d937090d2a0d9d72a449a2
Exempt-From-Owner-Approval: trivial conversion
(cherry-picked from commit e0b2ee52d2)
 2017-12-12 23:22:25 +00:00
Treehugger Robot
f7a69aeeab Merge "Bluetooth: Add convenience method to convert connection state to string" 2017-12-12 22:41:13 +00:00
TreeHugger Robot
a06854e77a Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev 2017-12-12 21:48:11 +00:00
Hansong Zhang
9c6044771f Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" am: 5b6b73800c 
am: 64d81fbf33

Change-Id: I1be05324ec0134c801de08e0f60139c341261f33
 2017-12-12 19:22:12 +00:00
Hansong Zhang
64d81fbf33 Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" 
am: 5b6b73800c

Change-Id: I29c61bf210b8bb01c3a51a12dca4e8a6d3e0d9e1
 2017-12-12 19:11:56 +00:00
Treehugger Robot
5b6b73800c Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" 2017-12-12 19:02:25 +00:00
Jack Yu
520b5df6bc Merge "Moved data connection response into system api." am: 8ded1cde4a 
am: 88aa63a6a2

Change-Id: Iac46d7f4c0d6c8d46df77c6349b325b5dd5831b3
 2017-12-12 18:29:04 +00:00
Jack Yu
88aa63a6a2 Merge "Moved data connection response into system api." 
am: 8ded1cde4a

Change-Id: Ibcd8c9c11459e39ea8ba32f9bb680716c1ac9b0d
 2017-12-12 18:18:09 +00:00
Treehugger Robot
8ded1cde4a Merge "Moved data connection response into system api." 2017-12-12 18:04:10 +00:00
Eric Erfanian
ec88187e62 Add assisted dialing properties to the framework. 
These properties allow the feature to be propogated from
the outgoing call broadcast, to the connection, to the call,
and finally to the call log as a feature.

Test: no existing unit tests found. could use some pointers
Bug: 35963245
Change-Id: I3ed8ac5ad7300c44f87e2573d9409b3a92b98ab6
Merged-In: I84343fb0cda16514c01997fd71d1e819b5b7eebb
 2017-12-12 09:45:01 -08:00