Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
437,839 Commits 3 Branches 0 Tags
bf9172deb4b76cd65d6546ce93e7f06758d07386
Commit Graph

437839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
bf9172deb4 Merge changes from topics "Expose IKE ID, TS & SaProposal", "Expose IKE exception and callback", "Expose IkeManager & IkeSession", "Expose SessionOptions & EapConfig" 
am: 091e420529

Change-Id: If8bb832c218e426210a9236c3c623da779b78f15
 2019-11-22 20:10:36 -08:00
evitayan
1230075676 Expose IKE module API: Session Options & EapSessionConfig 
am: 39202c84a1

Change-Id: I57f9ee22f7bdc88f1f6d1dd656b579c39bb4d453
 2019-11-22 20:10:31 -08:00
evitayan
4e19cf4738 Expose IKE module API: IkeException, configuration & callback 
am: c4a5883fc5

Change-Id: Ic22bf1514db08f0454ad7a3dcce5c125ce47a293
 2019-11-22 20:10:25 -08:00
evitayan
327e0fcecc Expose IKE module API: IKE ID, TS and SaProposal 
am: 69d77da91a

Change-Id: I3cc01a28d45bbf9d7706e0522b2c8e1fc8d5a78f
 2019-11-22 20:10:18 -08:00
Benedict Wong
091e420529 Merge changes from topics "Expose IKE ID, TS & SaProposal", "Expose IKE exception and callback", "Expose IkeManager & IkeSession", "Expose SessionOptions & EapConfig" 
* changes:
  Expose IKE module API: IkeManager and IkeSession
  Expose IKE module API: Session Options & EapSessionConfig
  Expose IKE module API: IkeException, configuration & callback
  Expose IKE module API: IKE ID, TS and SaProposal
 2019-11-23 03:45:53 +00:00
Meng Wang
fc5d525ff6 Merge "Clean up RLog usage" 
am: 3d0a47e717

Change-Id: If4f1a1adfe13f941e23244a9aeb03ae535e2c4c5
 2019-11-22 18:18:18 -08:00
Treehugger Robot
3d0a47e717 Merge "Clean up RLog usage" 2019-11-23 02:12:07 +00:00
Sarah Chin
ad7bacce36 Merge "Add NR to CellInfo" 
am: 35cf55c4eb

Change-Id: I2753e3f851f1e3c3d2c617b5d930efc980ecaa7f
 2019-11-22 17:10:58 -08:00
Sarah Chin
35cf55c4eb Merge "Add NR to CellInfo" 2019-11-23 01:05:04 +00:00
Greg Kaiser
6add1afd83 Merge "Fix system UI break in some devices" 
am: 19788abedd

Change-Id: I46611b172a94142a349d52008883c2beb1df490c
 2019-11-22 16:52:32 -08:00
Treehugger Robot
19788abedd Merge "Fix system UI break in some devices" 2019-11-23 00:43:42 +00:00
Charles Munger
769cf05c56 Merge "Deprecate FileUtils.closeQuietly" 
am: e4b84f3475

Change-Id: Ia2f71d7cd97b32a175d0210a8f567ae75030439e
 2019-11-22 16:03:14 -08:00
Sarah Chin
012ed94ad8 Add NR to CellInfo 
Add HAL 1.4 to CellInfo, CellInfoNr, CellIdentityNr

Test: atest RILTest
Bug: 144874741
Change-Id: I9a34b57cebddb3be810b86080aff1022557c4c24
Merged-In: I9a34b57cebddb3be810b86080aff1022557c4c24
 2019-11-22 15:54:58 -08:00
Treehugger Robot
e4b84f3475 Merge "Deprecate FileUtils.closeQuietly" 2019-11-22 23:52:41 +00:00
Greg Kaiser
74ebc36229 Fix system UI break in some devices 
Test: Verified impacted device UI works
Bug: 144958550
Change-Id: I08f77a6507edc076758d53f051fadd60fa6c8f9d
Merged-In: I08f77a6507edc076758d53f051fadd60fa6c8f9d
 2019-11-22 15:27:44 -08:00
Meng Wang
c742cb04d3 Clean up RLog usage 
Log is not necessary for tests.

Bug: 144374158
Test: atest
Change-Id: Ibec9ab9535e0f03e2331bbbae4630d6d8243a103
 2019-11-22 23:22:43 +00:00
Rahul Sabnis
e89625113d Merge "Resolve API dependencies on BluetoothPan" 
am: bad5a30d4f

Change-Id: Ic9e920c37c6417485f5be12ac6137bb6e0626b92
 2019-11-22 15:02:16 -08:00
Treehugger Robot
bad5a30d4f Merge "Resolve API dependencies on BluetoothPan" 2019-11-22 22:54:37 +00:00
Brad Ebinger
255cd441c2 Merge "replace hidden Context APIs" 
am: d363bc08e9

Change-Id: I22caa30c96fc7bc64c99d73d5697f63a597de32d
 2019-11-22 14:48:41 -08:00
Brad Ebinger
d363bc08e9 Merge "replace hidden Context APIs" 2019-11-22 22:42:11 +00:00
Charles Munger
87119ab3e2 Merge "Deprecate ListActivity and ExpandableListActivity" 
am: 0600b03d46

Change-Id: Ia077618f79c17277abe49ddd0bd8ddcc20586b0c
 2019-11-22 13:49:30 -08:00
Chen Xu
b930b0617d replace hidden Context APIs 
Bug: 137202333
Test: Build & Unit test
Merged-In: I1c0e364949aa6b518c126224097774066e089a17
Change-Id: I1c0e364949aa6b518c126224097774066e089a17
 2019-11-22 13:37:44 -08:00
Treehugger Robot
0600b03d46 Merge "Deprecate ListActivity and ExpandableListActivity" 2019-11-22 20:53:55 +00:00
Charles Munger
416618a591 Merge "Deprecate TimingLogger" 
am: aec0ab99d4

Change-Id: Ie6709d7e83ee68d491eac481635bcba3d44efe1e
 2019-11-22 12:51:48 -08:00
Treehugger Robot
aec0ab99d4 Merge "Deprecate TimingLogger" 2019-11-22 20:22:40 +00:00
Charles Munger
8292d73554 Merge "Deprecate Looper.prepareMainLooper" 
am: b1f69203e7

Change-Id: If66e250dcaa558eef033abaed08b72642004aec6
 2019-11-22 12:10:59 -08:00
Treehugger Robot
b1f69203e7 Merge "Deprecate Looper.prepareMainLooper" 2019-11-22 19:59:44 +00:00
Xin Li
ddc6af7053 DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master 
Bug: 144955631
Change-Id: I732bea5d874eede6a94ededba31b772c169ad247
 2019-11-22 10:47:04 -08:00
Jayachandran Chinnakkannu
d6900e4b3c Merge "Remove usage of hidden API Emoji.isRegionalIndicatorSymbol" 
am: 4257da213d

Change-Id: Iadaa0efcbc4ee9f5cecca4140132009044ba8503
 2019-11-22 10:15:56 -08:00
Ytai Ben-tsvi
e74637df68 Merge changes from topic "hidl-memory-java" 
am: 887aa66d0a

Change-Id: If36ca2aad9c3e68e5a5be49e9e1566e44f40511b
 2019-11-22 10:10:44 -08:00
Jayachandran Chinnakkannu
4257da213d Merge "Remove usage of hidden API Emoji.isRegionalIndicatorSymbol" 2019-11-22 17:54:23 +00:00
Ytai Ben-tsvi
887aa66d0a Merge changes from topic "hidl-memory-java" 
* changes:
  Add HidlMemoryUtil
  Add parceling support for HIDL memory in Java
 2019-11-22 17:54:06 +00:00
Paul Lawrence
3d3f98c5fe [automerger skipped] Merge "Use mContext directly, and enforce via logging" 
am: afb2c9e9cc -s ours
am skip reason: change_id Iaceec82d4716837158d1233400b4a44cbf67a5e8 with SHA1 8c7f0100c7 is in history

Change-Id: I3afb6208c45e434fa76ae736f05c6033d6cb4707
 2019-11-22 09:29:42 -08:00
Paul Lawrence
afb2c9e9cc Merge "Use mContext directly, and enforce via logging" 2019-11-22 17:19:38 +00:00
Kenny Root
1b506101de Merge "Make RecoverySystemService more testable" 
am: 49af39e751

Change-Id: I79d712e2c8739212c4a62e9db6deddf28091fafc
 2019-11-22 08:27:49 -08:00
Kenny Root
49af39e751 Merge "Make RecoverySystemService more testable" 2019-11-22 16:14:38 +00:00
Chalard Jean
aab1364ef9 Merge changes I195d894e,I7069c111 
am: 87ed7d7816

Change-Id: I8e41058df03284ca677bf67930c5702d7d6c63bb
 2019-11-22 06:27:42 -08:00
Chalard Jean
87ed7d7816 Merge changes I195d894e,I7069c111 
* changes:
  [NS A10] Cleanup
  [NS A09] Always rematch all networks to requests
 2019-11-22 14:08:09 +00:00
Andrei-Valentin Onea
c86bfb3390 [automerger skipped] Merge "Add metrics constant for platform compat UI." 
am: 48bb84c619 -s ours
am skip reason: change_id I1a1a708596ad003a7c95906fe9514db6ec518dfc with SHA1 e9e83a5554 is in history

Change-Id: I3e8019aadb2d50eca520643d541926b35d26d231
 2019-11-22 06:06:46 -08:00
Andrei-Valentin Onea
48bb84c619 Merge "Add metrics constant for platform compat UI." 2019-11-22 13:02:44 +00:00
Aaron Huang
4082917f46 Merge "Expose IpConfiguration and ProxyInfo APIs" 
am: 920a4a5b1b

Change-Id: I7fa9b282ca87f0c442e267acb8424f6aeed5d3a0
 2019-11-22 01:40:49 -08:00
Aaron Huang
920a4a5b1b Merge "Expose IpConfiguration and ProxyInfo APIs" 2019-11-22 09:25:16 +00:00
Remi NGUYEN VAN
8a72e3d3b4 Merge "Move shared packages to NetworkStack project" 
am: 27253f29ad

Change-Id: I17068de9e9b4388b8ec025ce3e1dc722e471ccbb
 2019-11-21 23:15:29 -08:00
Remi NGUYEN VAN
27253f29ad Merge "Move shared packages to NetworkStack project" 2019-11-22 06:50:22 +00:00
cncn
dca2d45630 Merge "Make Notification.Builder.SetFlag public" 
am: c8bd4aecb3

Change-Id: I3b8ff8e7c754b12778e40a9abcc829fb7a12671b
 2019-11-21 18:41:27 -08:00
Jayachandran C
c5ba7200d4 Remove usage of hidden API Emoji.isRegionalIndicatorSymbol 
This CL copies the logic in the local file

Bug: 140908357
Test: Build
Change-Id: I1044c456fdf6ad1646811c966e0cd38c67665ad9
 2019-11-21 16:49:46 -08:00
Treehugger Robot
c8bd4aecb3 Merge "Make Notification.Builder.SetFlag public" 2019-11-22 00:39:10 +00:00
Kenny Root
d508e1e61f Make RecoverySystemService more testable 
This allows the RecoverySystemService to be instantiated outside of its
lifecycle events and mocked connections to be injected during the tests.

Test: atest FrameworksServicesTests:RecoverySystemServiceTest
Merged-In: If75632b8dc16c916f3fa90853d6c1863b75d2c64
Change-Id: If75632b8dc16c916f3fa90853d6c1863b75d2c64
 2019-11-21 23:54:05 +00:00
Jayachandran Chinnakkannu
55e2207408 Merge "Remove usage of TelecomManager.from() hidden API" 
am: 07235288eb

Change-Id: Ic77adb515a9fea1dfa238908e3e4c754408d4103
 2019-11-21 15:53:12 -08:00
Jayachandran Chinnakkannu
07235288eb Merge "Remove usage of TelecomManager.from() hidden API" 2019-11-21 23:40:35 +00:00