Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
432,289 Commits 3 Branches 0 Tags
ba6777cd23df8e89da220a19340f1f69e2a0d5dc
Commit Graph

432289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Chien
ba6777cd23 Merge "Passing caller package name to setBluetoothTethering" am: 751f034b82 am: b2d0c6357c am: 8e3ad12386 
am: f1575b130f

Change-Id: I5df2aea7161a4261fa98ef7ed8567ff2ef0d0692
 2019-08-28 03:31:20 -07:00
Mark Chien
f1575b130f Merge "Passing caller package name to setBluetoothTethering" am: 751f034b82 am: b2d0c6357c 
am: 8e3ad12386

Change-Id: I5f158ae800ee0df5ee44d41a19a37ab90b39fc6b
 2019-08-28 03:24:39 -07:00
Mark Chien
8e3ad12386 Merge "Passing caller package name to setBluetoothTethering" am: 751f034b82 
am: b2d0c6357c

Change-Id: If3f6b8a5c7db9add48d1a871b933441b486ef6b7
 2019-08-28 03:18:43 -07:00
Mark Chien
b2d0c6357c Merge "Passing caller package name to setBluetoothTethering" 
am: 751f034b82

Change-Id: I7f6b22e4b8273cbdb3b40a7dd926e838d6fa7455
 2019-08-28 03:12:54 -07:00
Mark Chien
751f034b82 Merge "Passing caller package name to setBluetoothTethering" 2019-08-28 09:59:27 +00:00
Taesu Lee
5e30bf808b Merge "No need PDU data for deleteMessageFromIcc()" am: 0280bd3970 am: aa27371a71 am: 4b6e943d0d 
am: 9364284662

Change-Id: Iee7ea241539f8484e380c85046506ebd9cedf96a
 2019-08-28 02:13:12 -07:00
Taesu Lee
5dc7d3b06a Merge "Add new default_reserved_data_coding_scheme config" am: 7a71de717b am: 3676ee2e12 am: efa8e27c2e 
am: a588cb6642

Change-Id: Iea44bf72e2f971a213ba8a019c0c223ad57e6297
 2019-08-28 02:02:41 -07:00
Taesu Lee
9364284662 Merge "No need PDU data for deleteMessageFromIcc()" am: 0280bd3970 am: aa27371a71 
am: 4b6e943d0d

Change-Id: I2b87b4b52f69cc75400773f34215173cd7518d58
 2019-08-28 01:58:52 -07:00
Taesu Lee
a588cb6642 Merge "Add new default_reserved_data_coding_scheme config" am: 7a71de717b am: 3676ee2e12 
am: efa8e27c2e

Change-Id: I75f0b983ef5057972246175d2b7019a5c2002564
 2019-08-28 01:54:21 -07:00
Taesu Lee
4b6e943d0d Merge "No need PDU data for deleteMessageFromIcc()" am: 0280bd3970 
am: aa27371a71

Change-Id: I0f5e91ad92849059699f128216d02cbe6d3d2251
 2019-08-28 01:43:12 -07:00
Taesu Lee
efa8e27c2e Merge "Add new default_reserved_data_coding_scheme config" am: 7a71de717b 
am: 3676ee2e12

Change-Id: Idc1f8e61fbae88c71bde58aa56cf4b0bbf76b26b
 2019-08-28 01:32:01 -07:00
Taesu Lee
aa27371a71 Merge "No need PDU data for deleteMessageFromIcc()" 
am: 0280bd3970

Change-Id: Ida80e7e57477eb13a7d999ab589fef8e1139acb7
 2019-08-28 01:27:10 -07:00
Taesu Lee
3676ee2e12 Merge "Add new default_reserved_data_coding_scheme config" 
am: 7a71de717b

Change-Id: Ide11a58cae754e720862e1049ccb718670e46c31
 2019-08-28 01:21:59 -07:00
Treehugger Robot
0280bd3970 Merge "No need PDU data for deleteMessageFromIcc()" 2019-08-28 08:01:30 +00:00
Treehugger Robot
7a71de717b Merge "Add new default_reserved_data_coding_scheme config" 2019-08-28 07:57:29 +00:00
Remi NGUYEN VAN
f33a285abd [automerger skipped] Merge "Fix spacing in NetworkStackClient" am: c53985fc51 -s ours am: 4509978898 -s ours am: 6f8ec7840b -s ours 
am: 9c5292a8f5 -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 f061a709b6 is in history

Change-Id: Icc9e80f0f5cafcd6799a387431dcb0409d91a47f
 2019-08-27 22:09:34 -07:00
Remi NGUYEN VAN
9c5292a8f5 [automerger skipped] Merge "Fix spacing in NetworkStackClient" am: c53985fc51 -s ours am: 4509978898 -s ours 
am: 6f8ec7840b -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 622547b553 is in history

Change-Id: I1f2d26d13291093ffd41afe9f461d61b56ac6fb9
 2019-08-27 21:56:35 -07:00
Remi NGUYEN VAN
6f8ec7840b [automerger skipped] Merge "Fix spacing in NetworkStackClient" am: c53985fc51 -s ours 
am: 4509978898 -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 622547b553 is in history

Change-Id: I529c7947ff45e778f076bb1905c4bbb523db25b3
 2019-08-27 21:44:25 -07:00
Remi NGUYEN VAN
4509978898 [automerger skipped] Merge "Fix spacing in NetworkStackClient" 
am: c53985fc51 -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 622547b553 is in history

Change-Id: I48d077d7cb4c3dab0a75cef9aec124f0e706d58c
 2019-08-27 21:32:30 -07:00
Treehugger Robot
c53985fc51 Merge "Fix spacing in NetworkStackClient" 2019-08-28 04:08:18 +00:00
Shimi Zhang
4f1508d15e Merge "Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev am: 62c764e29b am: a4604013ae" into qt-r1-dev-plus-aosp 
am: 4d018e90f0

Change-Id: I78e7320ff2921d6109f0b82d6f761a77b00a6f4c
 2019-08-27 19:25:33 -07:00
Shimi Zhang
c39e091938 Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev am: 62c764e29b am: a4604013ae 
am: 028cc46bd5

Change-Id: I1bae94c672ac0a85ff6767adca8666011d65ed94
 2019-08-27 19:22:20 -07:00
Shimi Zhang
3446691be1 Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev am: 62c764e29b am: d081f1064d 
am: 0922cc17be

Change-Id: I651134edf0940a5425c5a613dc2308b21fd76892
 2019-08-27 19:19:45 -07:00
Android Build Merger (Role)
4d018e90f0 Merge "Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev am: 62c764e29b am: a4604013ae" into qt-r1-dev-plus-aosp 2019-08-28 02:12:43 +00:00
Shimi Zhang
0922cc17be Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev am: 62c764e29b 
am: d081f1064d

Change-Id: I2c02ba4da3494dfda62f13e5891a9a24e474abc7
 2019-08-27 19:11:46 -07:00
Shimi Zhang
6d7ae822e2 Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev am: 62c764e29b 
am: a4604013ae

Change-Id: Ib1a24fc6b8b20a4f4528ebde0c5d52ebe34e451b
 2019-08-27 19:11:46 -07:00
Shimi Zhang
028cc46bd5 Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev am: 62c764e29b 
am: a4604013ae

Change-Id: I443bdb67a8e99508788f88f5c377da8dac1aca0d
 2019-08-27 19:11:45 -07:00
Shimi Zhang
a4604013ae Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev 
am: 62c764e29b

Change-Id: Ib1d1aa6262c3571c4c4f284b12dfe1ec5b40e3c8
 2019-08-27 18:59:46 -07:00
Remi NGUYEN VAN
341c0f026a Fix spacing in NetworkStackClient 
This makes the file match other branches, which should eliminate merge
conflicts.

Test: m
Merged-In: I673581b0067b9a3f72dd68a3ab622c18183ebd2e
Change-Id: Ida685159cb4afd6eceac6941e7126886518c8570
 2019-08-28 10:59:34 +09:00
Shimi Zhang
d081f1064d Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev 
am: 62c764e29b

Change-Id: Idaa6942a802f446e664ec3e2c6078258d9d2f8cc
 2019-08-27 18:58:42 -07:00
Daniel Rosenberg
1611e0f980 Use mContext directly am: dd3737611c am: 6cc5076442 
am: 3a31fc4f07

Change-Id: Idba4730c171dfa542923a9fe920b780173599102
 2019-08-27 18:54:09 -07:00
TreeHugger Robot
62c764e29b Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev 2019-08-28 01:39:59 +00:00
Daniel Rosenberg
13062ade13 Use mContext directly am: dd3737611c am: 6cc5076442 
am: 909531d5e2

Change-Id: I76c5be5001e0a642e346c5357bc0e3935bebda2c
 2019-08-27 18:35:30 -07:00
Vishnu Nair
e66b5522c8 Merge "Clear binder references and flush operations when destroying NativeInputWindowHandle" into qt-qpr1-dev 
am: f8c3ac92da

Change-Id: I31bb4584916770c7353ee0a2461c550e8df25a5d
 2019-08-27 18:30:46 -07:00
Jiyong Park
c7b53f7540 Merge "Use framework_native_aidl for AIDL files in frameworks/native/aidl" am: 46993bb4f5 am: f4b1cdfe5d am: 02ce7858e5 
am: cb6b9f12c7

Change-Id: Id28af2dbaefa61919c7c6b03f4207e237c66f8e7
 2019-08-27 18:27:40 -07:00
Daniel Rosenberg
909531d5e2 Use mContext directly am: dd3737611c 
am: 6cc5076442

Change-Id: I0d7a49fe556e0b23640aac5546cb2590c790caf2
 2019-08-27 18:23:39 -07:00
Daniel Rosenberg
3a31fc4f07 Use mContext directly am: dd3737611c 
am: 6cc5076442

Change-Id: I693fda7185f1a4bf91c5c2c9a6739ce1f706c86c
 2019-08-27 18:22:30 -07:00
Daniel Rosenberg
bae1f61ca0 Use mContext directly am: dd3737611c am: a501523d98 
am: d708097116

Change-Id: I7771e8619f5087ecdfbecec475684c58c2e7a371
 2019-08-27 18:13:25 -07:00
TreeHugger Robot
f8c3ac92da Merge "Clear binder references and flush operations when destroying NativeInputWindowHandle" into qt-qpr1-dev 2019-08-28 01:11:01 +00:00
Daniel Rosenberg
6cc5076442 Use mContext directly 
am: dd3737611c

Change-Id: Icf6e6216a789f8f7899eeae39cd253e285d7c98e
 2019-08-27 18:10:41 -07:00
Jiyong Park
cb6b9f12c7 Merge "Use framework_native_aidl for AIDL files in frameworks/native/aidl" am: 46993bb4f5 am: f4b1cdfe5d 
am: 02ce7858e5

Change-Id: I59a72db95256a7cb4fbcaf035e3a8f0a232d9f80
 2019-08-27 18:06:39 -07:00
Ian Kasprzak
0b7eef0e85 [automerger skipped] Merge "[DO NOT MERGE] Disable com.android.preload.check.PreloadCheck#testBlackList" into stage-aosp-master am: 666cb0f1e1 -s ours am: c49388c465 
am: 35895634e9

Change-Id: I05ccd067fb2719e217cbed37ab2cfd5f91024758
 2019-08-27 18:04:07 -07:00
Tiem Song
c330c997f5 Merge "Update droiddoc with combined generation of Java and Kotlin docs" am: ca31913b92 am: fccf7d8949 am: 24838df3f3 
am: 35b5db56c9

Change-Id: Ie86761f97cb65d3a7fd435ad5c1f8866a0bd0688
 2019-08-27 17:56:38 -07:00
Jiyong Park
02ce7858e5 Merge "Use framework_native_aidl for AIDL files in frameworks/native/aidl" am: 46993bb4f5 
am: f4b1cdfe5d

Change-Id: I178ec4473fb7659ee53e8c31fc8b079847929686
 2019-08-27 17:48:35 -07:00
Daniel Rosenberg
d708097116 Use mContext directly am: dd3737611c 
am: a501523d98

Change-Id: I04174359a55d0f8396adee6ce494d02a06918973
 2019-08-27 17:41:27 -07:00
Jiyong Park
f4b1cdfe5d Merge "Use framework_native_aidl for AIDL files in frameworks/native/aidl" 
am: 46993bb4f5

Change-Id: Ib87a5f2563707ffbd2eb2420487f618ee9eb39c7
 2019-08-27 17:35:39 -07:00
Ian Kasprzak
35895634e9 [automerger skipped] Merge "[DO NOT MERGE] Disable com.android.preload.check.PreloadCheck#testBlackList" into stage-aosp-master am: 666cb0f1e1 -s ours 
am: c49388c465

Change-Id: I03bd91906aa5fd2db9d5bde81752945e323896df
 2019-08-27 17:35:06 -07:00
Tiem Song
35b5db56c9 Merge "Update droiddoc with combined generation of Java and Kotlin docs" am: ca31913b92 am: fccf7d8949 
am: 24838df3f3

Change-Id: Ia3efd00d211b16e35aeca633e9519096a908fba2
 2019-08-27 17:27:12 -07:00
Treehugger Robot
46993bb4f5 Merge "Use framework_native_aidl for AIDL files in frameworks/native/aidl" 2019-08-28 00:07:25 +00:00
Daniel Rosenberg
a501523d98 Use mContext directly 
am: dd3737611c

Change-Id: I840a610e2976f29aae875899445d8b863c298e45
 2019-08-27 16:40:11 -07:00