Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
431,911 Commits 3 Branches 0 Tags
2df5baab1908dbf172bc7542c7318aac1b90ec77
Commit Graph

431911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathieu Chartier
2df5baab19 Merge "Add a test that we get samples for a common core-oj method" am: 5a883e16e8 
am: 4616df8a03

Change-Id: Iffbf1889701bd82f94a337411a31dacdb816243e
 2019-10-02 13:24:49 -07:00
Jordan Liu
c6ac2a7ebe Merge "Expose CdmaSmsCbProgramData as SystemApi" am: e3dfe362dc 
am: 94d4fcb7b3

Change-Id: I3f3b9d269d91abab4438922945b6952991c890bb
 2019-10-02 13:24:18 -07:00
Brad Ebinger
4d4dc1165a Merge "Add Telecom command for setting connectionservice filter" am: 25f4dca660 
am: 05e03e8c0c

Change-Id: I8fa922ff7d743397a0e2936c029c4551f9c0b844
 2019-10-02 13:13:23 -07:00
Stan Iliev
8a0098befe Merge "Improve comparison of fractions" am: 0517cd144f 
am: b7cdf14a1f

Change-Id: I12f360c0f8de184134a750fb4051c075a6cce5c3
 2019-10-02 13:10:34 -07:00
Nathan Harold
f42ab60345 Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" am: c75cf96f72 
am: e65e064e22

Change-Id: If7b4c7f58d2237bca86f2a67b1d055603a094440
 2019-10-02 13:08:51 -07:00
Chun-Wei Wang
ea9d9a68e9 Merge "Show file path when listing APEXes (1/n)" am: e899023544 
am: 016c1275aa

Change-Id: I8b39239fe7ff27abaf9a57f5f0a3ded94231048e
 2019-10-02 12:58:02 -07:00
Jeffrey Vander Stoep
b77f03f32c Merge "InetDiagSocketTest: ignore test that times out" am: 152ced4b87 
am: 7dfbd004da

Change-Id: I34890df3f3f36a9a6c43c9635f87b9c9b096f497
 2019-10-02 12:57:09 -07:00
Chalard Jean
2e8be0cae3 Merge "Rename some Vpn fields." am: d1c510f749 
am: 4355ad58c6

Change-Id: I948d3f6afe6b01d074e2c1f8f8ea24cdca20991e
 2019-10-02 12:56:40 -07:00
Tobias Thierer
6b6924dc24 Merge changes Iaf918ce3,I60032b97 am: 2efe92bdbe 
am: 3548c97042

Change-Id: Ie53da942315c74cc43e843f6d003fb004b766484
 2019-10-02 12:56:07 -07:00
Chalard Jean
2c9b653aae Merge "Opportunistic cleanup" am: 15da7c17b5 
am: fe9ddd50ac

Change-Id: I467dd780d1ca25ae53f3205288ec1797451a80bf
 2019-10-02 12:55:37 -07:00
Hall Liu
be6af82a61 [automerger skipped] Merge "Add carrier config for ignoring user RTT setting" am: e93165456c 
am: 7fe39a8776 -s ours
am skip reason: change_id I481fb945fd76181a0c59cb433c2959b532127153 with SHA1 788d01b71e is in history

Change-Id: I5a8d85125754ec861383f6aea9fe6e4a26506409
 2019-10-02 12:53:58 -07:00
Seigo Nonaka
de76f6ee38 [automerger skipped] RESTRICT AUTOMERGE Do not compute outside given range in TextLine am: 4ce901e405 am: b51c7bb175 am: af62f3a7b3 -s ours am: 86ddd9eb6a -s ours am: eab868fa63 
am: 59bfe5d653

Change-Id: I4974f4242f138b989bf097b39303e5d4db9df2fd
 2019-10-02 10:44:31 -07:00
Seigo Nonaka
59bfe5d653 [automerger skipped] RESTRICT AUTOMERGE Do not compute outside given range in TextLine am: 4ce901e405 am: b51c7bb175 am: af62f3a7b3 -s ours am: 86ddd9eb6a -s ours 
am: eab868fa63

Change-Id: I2f88eecd916f2642cc3cb0c8ba91ed6348247900
 2019-10-02 10:38:35 -07:00
Seigo Nonaka
eab868fa63 [automerger skipped] RESTRICT AUTOMERGE Do not compute outside given range in TextLine am: 4ce901e405 am: b51c7bb175 am: af62f3a7b3 -s ours 
am: 86ddd9eb6a -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6db3a3499cb02ef1bd34232a4ca8fb362b18e7d
 2019-10-02 10:30:08 -07:00
Seigo Nonaka
86ddd9eb6a [automerger skipped] RESTRICT AUTOMERGE Do not compute outside given range in TextLine am: 4ce901e405 am: b51c7bb175 
am: af62f3a7b3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifb67887f4b1a5860dca2569e57a74911efde801d
 2019-10-02 10:10:34 -07:00
Sterling Huber
825b305637 [automerger skipped] Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev am: e352c1f2bc -s ours am: 66e93df90a 
am: 43a23b721a

Change-Id: Ia35c3b2558e61ba194bb6da5a8415bfc67fd7bed
 2019-10-02 10:10:31 -07:00
Sterling Huber
43a23b721a [automerger skipped] Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev am: e352c1f2bc -s ours 
am: 66e93df90a

Change-Id: I1c8d52d8db52e53f15095d43e9744ece11f9c900
 2019-10-02 09:59:45 -07:00
Seigo Nonaka
af62f3a7b3 RESTRICT AUTOMERGE Do not compute outside given range in TextLine am: 4ce901e405 
am: b51c7bb175

Change-Id: I6770f4b1a884020c374a75f67eb762b2c2bfd538
 2019-10-02 09:59:45 -07:00
Sterling Huber
66e93df90a [automerger skipped] Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev 
am: e352c1f2bc -s ours
am skip reason: subject contains skip directive

Change-Id: Id51032f27a8325444290483a9a30da49da8ac2e2
 2019-10-02 09:33:57 -07:00
Seigo Nonaka
b51c7bb175 RESTRICT AUTOMERGE Do not compute outside given range in TextLine 
am: 4ce901e405

Change-Id: I739746d80a8dd29998a67c1d9aaa2d3f804ac57c
 2019-10-02 09:33:53 -07:00
Sterling Huber
e352c1f2bc Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev 2019-10-02 15:51:19 +00:00
Mathieu Chartier
4616df8a03 Merge "Add a test that we get samples for a common core-oj method" 
am: 5a883e16e8

Change-Id: I48992b03e5ecc16d58608bae47e8262601a38a87
 2019-10-01 16:17:20 -07:00
Mathieu Chartier
5a883e16e8 Merge "Add a test that we get samples for a common core-oj method" 2019-10-01 23:09:07 +00:00
TreeHugger Robot
edc5888df7 Merge "Check GL extension is supported before using it in glwallpaper" into qt-r1-dev-plus-aosp 2019-10-01 21:10:36 +00:00
Jorge E. Moreira
2ef0814056 Check GL extension is supported before using it in glwallpaper 
glwallpaper requests a GL context with low priority, however this
feature is a GL extension that may not be available in the GL
implementation (swiftshader, for example).

Bug: 138834844
Test: run cuttlefish locally
Merged-In: I72edeb0f4dc03e51bda22209415604e752c18e52
Change-Id: I72edeb0f4dc03e51bda22209415604e752c18e52
 2019-10-01 21:09:06 +00:00
Jordan Liu
94d4fcb7b3 Merge "Expose CdmaSmsCbProgramData as SystemApi" 
am: e3dfe362dc

Change-Id: I8ff5254d03558c69bc0cd8fd57a7337349de6be2
 2019-10-01 13:51:51 -07:00
Jordan Liu
e3dfe362dc Merge "Expose CdmaSmsCbProgramData as SystemApi" 2019-10-01 20:33:29 +00:00
Bill Yi
44642cf1f4 [automerger skipped] Import translations. DO NOT MERGE 
am: bfb7a7227c -s ours
am skip reason: subject contains skip directive

Change-Id: I50b9e3bb8363e297d9f4a98dd980c91d46f798a6
 2019-10-01 13:15:26 -07:00
Mathieu Chartier
bafd39c1cb Add a test that we get samples for a common core-oj method 
Test: atest frameworks/base/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java
Bug: 139883463
Change-Id: I11d0d98731756da5b9739b18acb5ab140657ca34
 2019-10-01 19:53:19 +00:00
Bill Yi
bfb7a7227c Import translations. DO NOT MERGE 
BUG:138175268

Change-Id: I4e6ca4ed7c7ba4a39a15988100fad60dafd79c02
Auto-generated-cl: translation import
 2019-10-01 11:19:50 -07:00
Brad Ebinger
05e03e8c0c Merge "Add Telecom command for setting connectionservice filter" 
am: 25f4dca660

Change-Id: I00ba7ce3b64f4680eaf8798c52d98318160b45f0
 2019-10-01 10:51:45 -07:00
Stan Iliev
b7cdf14a1f Merge "Improve comparison of fractions" 
am: 0517cd144f

Change-Id: I211f5ea4546e400b328c244908e23cb7c375eb04
 2019-10-01 10:49:14 -07:00
Nathan Harold
e65e064e22 Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" 
am: c75cf96f72

Change-Id: I4485da245b76c4ed8fba638092912564acc0927e
 2019-10-01 10:46:48 -07:00
Jordan Liu
4ae91c0308 Expose CdmaSmsCbProgramData as SystemApi 
Only getOperation and getCategory are currently used, so we only expose
those parts of the functionality. Eventually if we move BearerData to
the CBR app we will also have to expose the constructor, at which point
we may also want to expose the other constants that the constructor
uses, but for now this is okay.

Bug: 135956699
Test: manual
Change-Id: I1d3ba564372845f9b8a470adf82e84df745c02a7
Merged-In: I1d3ba564372845f9b8a470adf82e84df745c02a7
 2019-10-01 10:42:56 -07:00
Brad Ebinger
25f4dca660 Merge "Add Telecom command for setting connectionservice filter" 2019-10-01 17:30:40 +00:00
Treehugger Robot
0517cd144f Merge "Improve comparison of fractions" 2019-10-01 17:30:17 +00:00
Nathan Harold
c75cf96f72 Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" 2019-10-01 17:29:29 +00:00
Chun-Wei Wang
016c1275aa Merge "Show file path when listing APEXes (1/n)" 
am: e899023544

Change-Id: I1fbd43b1eec4d1af2ed279e30e18655ed61db780
 2019-10-01 04:24:46 -07:00
Jeffrey Vander Stoep
7dfbd004da Merge "InetDiagSocketTest: ignore test that times out" 
am: 152ced4b87

Change-Id: Iff27cea9d43b6a044e0f91cc88fad46664b4660b
 2019-10-01 04:11:14 -07:00
Chun-Wei Wang
e899023544 Merge "Show file path when listing APEXes (1/n)" 2019-10-01 11:10:49 +00:00
Jeffrey Vander Stoep
152ced4b87 Merge "InetDiagSocketTest: ignore test that times out" 2019-10-01 10:44:24 +00:00
Chalard Jean
4355ad58c6 Merge "Rename some Vpn fields." 
am: d1c510f749

Change-Id: I4aac3d05aa5b879be67f1e3673e1d930e2160cb8
 2019-10-01 02:34:10 -07:00
Chalard Jean
d1c510f749 Merge "Rename some Vpn fields." 2019-10-01 09:08:07 +00:00
Jeff Vander Stoep
69b83c9b3c InetDiagSocketTest: ignore test that times out 
Test: atest InetDiagSocketTest
Change-Id: Ieef0ca291924c0d81b1110bd25020d57fa9f0fec
Bug: 141870193
 2019-10-01 08:21:41 +00:00
Tobias Thierer
3548c97042 Merge changes Iaf918ce3,I60032b97 
am: 2efe92bdbe

Change-Id: I076249c9ccf563905c52b272a8c25c14da8e5711
 2019-10-01 00:23:44 -07:00
Treehugger Robot
2efe92bdbe Merge changes Iaf918ce3,I60032b97 
* changes:
  Introduce vendor.mime.types
  android.mime.types: Fix typo.
 2019-10-01 07:02:16 +00:00
Chalard Jean
fe9ddd50ac Merge "Opportunistic cleanup" 
am: 15da7c17b5

Change-Id: I5ac4ae5f941e741a88c595ae5f12b804a758abe6
 2019-09-30 22:38:25 -07:00
Chalard Jean
15da7c17b5 Merge "Opportunistic cleanup" 2019-10-01 05:25:57 +00:00
Hall Liu
7fe39a8776 Merge "Add carrier config for ignoring user RTT setting" 
am: e93165456c

Change-Id: I73a4ab7963525669ccc74ef634345077e0ce618f
 2019-09-30 18:46:17 -07:00
Hall Liu
e93165456c Merge "Add carrier config for ignoring user RTT setting" 2019-10-01 01:37:05 +00:00