Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
384,536 Commits 3 Branches 0 Tags
771628aba995f32246d2dfbfcb453e61ba50a665
Commit Graph

384536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chalard Jean
771628aba9 Merge "Add a static to get the Ip Memory Store" am: bee0cbe5df 
am: 9f1414dac1

Change-Id: Ibcd5e3cfb34262b69661329878f27587eaf84180
 2019-03-11 08:14:03 -07:00
Chalard Jean
9f1414dac1 Merge "Add a static to get the Ip Memory Store" 
am: bee0cbe5df

Change-Id: I8cf868ca1801f30a772fea7716e0b9fd322a80de
 2019-03-11 08:04:48 -07:00
Treehugger Robot
bee0cbe5df Merge "Add a static to get the Ip Memory Store" 2019-03-11 14:56:34 +00:00
Chalard Jean
5d8b7c875d Add a static to get the Ip Memory Store 
This is so that there is some AOSP stable API while the
memory store is moved to the network.

Test: atest FrameworksNetTests
Change-Id: Ib51dbee77fcb0d14a5c85240ac711b3b1aa71286
 2019-03-11 20:48:08 +09:00
Chalard Jean
6558544a75 Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." am: af5acad9f1 
am: d378db0b2e

Change-Id: Iee504061c4b61668990489e70d0dd0b75606d24b
 2019-03-11 04:30:54 -07:00
Chalard Jean
d378db0b2e Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." 
am: af5acad9f1

Change-Id: Ib8b991ce89fb94d7f0f8b865a1909f73b0b5be0d
 2019-03-11 04:21:36 -07:00
Treehugger Robot
af5acad9f1 Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." 2019-03-11 11:07:21 +00:00
Chalard Jean
29f63aff0f [PT17.5] Revert to booleans for send/not send broadcast constants. 
In PT17, for security of the patch these two constants have been
switched from boolean to enum values. While this is nice for making
sure a patch is correct, it's also pretty wasteful. Now that it's
certain that the values of these fields don't matter, they can be
set to logical values (as opposed to reversed as it was the case
before PT17.

Test: runtest
Change-Id: I93a0780e23c2f658687be066dc16f27529baaa86
 2019-03-11 15:58:31 +09:00
Chalard Jean
1f3a202559 Merge "Make ParseException less useless." am: 8e8ed1dfc2 
am: 55fae4c14c

Change-Id: I045520c106529c266f5e06f29bb32cf078df7f8b
 2019-03-10 21:29:02 -07:00
Chalard Jean
55fae4c14c Merge "Make ParseException less useless." 
am: 8e8ed1dfc2

Change-Id: If582e61ca92e5414edea351934053fa0ab6b04bf
 2019-03-10 21:19:42 -07:00
Treehugger Robot
8e8ed1dfc2 Merge "Make ParseException less useless." 2019-03-11 04:06:48 +00:00
Remi NGUYEN VAN
45a41cf19d Merge changes I9dbbf904,Iebc174ed am: 06d8067975 
am: 91b2b0cc60

Change-Id: I5dc5cc12347755cf48dfedfdd20f50c63dfd30f5
 2019-03-10 19:30:03 -07:00
Remi NGUYEN VAN
91b2b0cc60 Merge changes I9dbbf904,Iebc174ed 
am: 06d8067975

Change-Id: I30176a7bd0992d3a038458c0ccbe3a7ba9ecc9f7
 2019-03-10 19:22:45 -07:00
Remi NGUYEN VAN
06d8067975 Merge changes I9dbbf904,Iebc174ed 
* changes:
  Move NetworkStackTests to presubmit
  Remove NetworkStack test dependency on testutils
 2019-03-11 02:06:27 +00:00
TreeHugger Robot
4048d32e48 Merge "resolve merge conflicts of 04d262db15 to pi-dev-plus-aosp" into pi-dev-plus-aosp 2019-03-08 23:47:40 +00:00
Nicolas Geoffray
3d1b2b2201 Merge "Update current API after adding nullable annotations." am: c06c54662b 
am: f99fce01f2

Change-Id: I6de8a5f2eba41dd3aba306a79fcdb32acb9cc80b
 2019-03-08 15:44:20 -08:00
Sasha Smundak
c15ff15587 Merge "Convert tests/**/Android.mk files to Android.bp" am: 40ff4f7d83 
am: c33506ce2f

Change-Id: Ia1a6c26f4f786f22763ebde95b238887914951f4
 2019-03-08 15:33:18 -08:00
Nicolas Geoffray
f99fce01f2 Merge "Update current API after adding nullable annotations." 
am: c06c54662b

Change-Id: If2c150f68b79f990edc046cce6ccc0d5bd85b5bf
 2019-03-08 15:27:04 -08:00
Sasha Smundak
c33506ce2f Merge "Convert tests/**/Android.mk files to Android.bp" 
am: 40ff4f7d83

Change-Id: If96014624542d6c99f7d0841347806954dbd4a42
 2019-03-08 15:20:09 -08:00
Nicolas Geoffray
c06c54662b Merge "Update current API after adding nullable annotations." 2019-03-08 23:15:03 +00:00
Treehugger Robot
40ff4f7d83 Merge "Convert tests/**/Android.mk files to Android.bp" 2019-03-08 22:54:11 +00:00
Nazanin Bakhshi
8a95207b86 Merge "update getStaticPhoneCapability to use HAL instead of default value" am: 9e6f5d1521 
am: 109f4590ca

Change-Id: I2b43c2ad3f6e6b6789a6f124fce43d8d87b9d8c0
 2019-03-08 14:52:01 -08:00
Nazanin Bakhshi
d7735a130a Merge "make onActiveDataSubId in PhoneStateListener public API" am: dfe984c3fe 
am: 558a5e2632

Change-Id: Iecac7b32f88a2b4d8d3236b2e571dde832b49044
 2019-03-08 14:41:14 -08:00
Nazanin Bakhshi
109f4590ca Merge "update getStaticPhoneCapability to use HAL instead of default value" 
am: 9e6f5d1521

Change-Id: Ib146ba3b8a7db7ed151ea721ceb57b21e4b44ac3
 2019-03-08 14:31:03 -08:00
Irina Dumitrescu
27369f9928 Merge "Add Keystore get option that supresses caught exceptions warnings." am: f070b51670 
am: 7bf37cf83d

Change-Id: I90d0e2f575f8291093e76d9b4908e3ff02e8f168
 2019-03-08 14:26:20 -08:00
Nazanin Bakhshi
558a5e2632 Merge "make onActiveDataSubId in PhoneStateListener public API" 
am: dfe984c3fe

Change-Id: Ic385f5372535220bbeda6351974b22081a2e8b30
 2019-03-08 14:21:29 -08:00
Irina Dumitrescu
7bf37cf83d Merge "Add Keystore get option that supresses caught exceptions warnings." 
am: f070b51670

Change-Id: I5f229fc9d08e445c32ea8cf4e971129d79019cef
 2019-03-08 14:16:35 -08:00
Treehugger Robot
9e6f5d1521 Merge "update getStaticPhoneCapability to use HAL instead of default value" 2019-03-08 22:05:59 +00:00
Nazanin Bakhshi
dfe984c3fe Merge "make onActiveDataSubId in PhoneStateListener public API" 2019-03-08 22:00:33 +00:00
Treehugger Robot
f070b51670 Merge "Add Keystore get option that supresses caught exceptions warnings." 2019-03-08 21:58:46 +00:00
Nathan Harold
37f2d61ca0 Merge "Add TimeStamp Constructor for HAL 1.4 Support" am: f899e26857 
am: 8dada71897

Change-Id: I402d3dfbaba9fabdd65956fd23b3879d0d77df7e
 2019-03-08 11:56:04 -08:00
Nazanin Bakhshi
ceaf9684a5 update getStaticPhoneCapability to use HAL instead of default value 
Bug: 123359867
Test: build
Change-Id: Ic40921679ade1f9be42f2bc3d5170ba201dbab5a
Merged-In: Ic40921679ade1f9be42f2bc3d5170ba201dbab5a
(cherry picked from commit 1772247b04)
 2019-03-08 19:50:59 +00:00
Nathan Harold
8dada71897 Merge "Add TimeStamp Constructor for HAL 1.4 Support" 
am: f899e26857

Change-Id: I9f96a8846bfb137bdcae8d8495188229637fac2c
 2019-03-08 11:39:33 -08:00
Nazanin Bakhshi
4d2eceffab Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE" am: 016409b3d5 
am: 26891a4429

Change-Id: Ic9600095313ed557a119f9e0dd656b9230dd3056
 2019-03-08 11:29:56 -08:00
Nazanin Bakhshi
a160067016 make onActiveDataSubId in PhoneStateListener public API 
Bug: 124260187
Test: CTS
Change-Id: I6e5a5c8273348d822b8f552599784b8e986850bf
Merged-In: I6e5a5c8273348d822b8f552599784b8e986850bf
(cherry picked from commit 026c42d752)
 2019-03-08 19:24:22 +00:00
Nathan Harold
f899e26857 Merge "Add TimeStamp Constructor for HAL 1.4 Support" 2019-03-08 19:03:47 +00:00
Max Bires
c640787c11 Merge "Adding KEY_PERMANENTLY_INVALIDATED int" am: 18e0781d3d 
am: e6faa759d6

Change-Id: Ib0c090a9b54086fa1f0dcac9380584365fa59ed2
 2019-03-08 10:54:49 -08:00
Nazanin Bakhshi
26891a4429 Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE" 
am: 016409b3d5

Change-Id: I2ced5079661da96b12c3359b6dc89412b585993a
 2019-03-08 10:45:20 -08:00
Tyler Gunn
6ab6033276 Merge "Add carrier config key for TTY support." am: 16f6deae44 
am: 61ccd176f0

Change-Id: Ia4efbe04195934e4320ac3ae9f9eaf49ee66350f
 2019-03-08 10:28:50 -08:00
Nazanin Bakhshi
016409b3d5 Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE" 2019-03-08 18:25:59 +00:00
Max Bires
e6faa759d6 Merge "Adding KEY_PERMANENTLY_INVALIDATED int" 
am: 18e0781d3d

Change-Id: I9a31a0b3c9abc72a619c06c2ffc092d5ef557213
 2019-03-08 10:22:53 -08:00
Tyler Gunn
61ccd176f0 Merge "Add carrier config key for TTY support." 
am: 16f6deae44

Change-Id: Icd9d8ee8be9a4dafcca5ae6808b167c49e2e9e9f
 2019-03-08 10:17:24 -08:00
David Anderson
2f2970f242 Merge "Update DynamicAndroidService for IGsiService AIDL changes." am: 1451b2f3a5 
am: 123a9ed245

Change-Id: I4c1b812fa60beee87a59efa9385e2d2bb3b21117
 2019-03-08 10:11:47 -08:00
andychou
7a3b8109cf resolve merge conflicts of 04d262db15 to pi-dev-plus-aosp 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I2c7feea798df2d9bbfae4ee0847ef151b0d21511
Change-Id: I417960cc1c873425ef6b9b5d74f9bf5d9658a390
 2019-03-09 02:06:17 +08:00
David Anderson
123a9ed245 Merge "Update DynamicAndroidService for IGsiService AIDL changes." 
am: 1451b2f3a5

Change-Id: I09b53ae751ffdff9e7fa31a8e5ee347bf42a347c
 2019-03-08 09:55:40 -08:00
Max Bires
18e0781d3d Merge "Adding KEY_PERMANENTLY_INVALIDATED int" 2019-03-08 17:53:05 +00:00
Tyler Gunn
16f6deae44 Merge "Add carrier config key for TTY support." 2019-03-08 17:52:52 +00:00
David Anderson
1451b2f3a5 Merge "Update DynamicAndroidService for IGsiService AIDL changes." 2019-03-08 17:39:44 +00:00
Andrei-Valentin Onea
b270bc89cf Merge "Add extra hidden api related tags" am: cfd72b9386 
am: d63ef04944

Change-Id: I90ad865bda1bb1efb66628e91ea4ec0758579e0a
 2019-03-08 09:38:49 -08:00
Chalard Jean
5a390b36ae Merge "Give Telephony the permissions to access the network stack." am: a6f3476476 
am: 1dba2f82ad

Change-Id: I94d4e4903f303ead2193a64578a605a311cc5be8
 2019-03-08 09:13:00 -08:00