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

437815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ytai Ben-Tsvi
a736d1c1ee Add HidlMemoryUtil 
Convenience utilities for working with HidlMemory.

Change-Id: I85a46d37de7b89fb48c57f69b1552ca59b802c19
Merged-In: I85a46d37de7b89fb48c57f69b1552ca59b802c19
Bug: 143566068
 2019-11-21 15:28:09 -08:00
Ytai Ben-Tsvi
a907efc3bc Add parceling support for HIDL memory in Java 
This change adds support for reading/writing a HidlMemory
instance into / out of a HwParcel and HwBlob, in a format that
is compatible with the hidl_memory C++ type.
This paves the way to be able to exchange shared memory blocks
between native and Java via HwBinder, which will be exposed
as adding Java support for the HIDL 'memory' type.

Change-Id: I6cbbf852218c8a631f9014e7caa7a97d17e11889
Bug: 143566068
Merged-In: I6cbbf852218c8a631f9014e7caa7a97d17e11889
 2019-11-21 15:19:47 -08:00
Jordan Liu
850525ffaf Merge "Expose SmsCbLocation and SmsCbMessage constructors" 
am: d87727f7d9

Change-Id: I24bfb6ed5fa25a810c2a5fe78745091f5b576162
 2019-11-21 15:02:37 -08:00
cncn
9d0fd9c9d6 Make Notification.Builder.SetFlag public 
Bug: 144846447
Test: Build Successfully
Change-Id: If25bede41eec1f7e7ca3ae8fc669df1964d7da05
 2019-11-21 22:55:13 +00:00
Jordan Liu
d87727f7d9 Merge "Expose SmsCbLocation and SmsCbMessage constructors" 2019-11-21 22:44:52 +00:00
Jordan Liu
c3922ef9a4 Expose SmsCbLocation and SmsCbMessage constructors 
Bug: 135956699
Test: manual
Change-Id: Ic2a58005db6f5d01b6769b84b8cf7d5f013bbbf1
Merged-In: Ic2a58005db6f5d01b6769b84b8cf7d5f013bbbf1
 2019-11-21 13:14:02 -08:00
Bookatz
12b5e9f4c4 Merge "Update OWNERS for some server/pm/User files" 
am: 26ba7c0911

Change-Id: I3085297a4d70ee91b92c1b34c349bcf37f0024bc
 2019-11-21 12:36:42 -08:00
Treehugger Robot
26ba7c0911 Merge "Update OWNERS for some server/pm/User files" 2019-11-21 20:01:27 +00:00
Jayachandran C
8aa54aa288 Remove usage of TelecomManager.from() hidden API 
Bug: 140908357
Test: Build
Change-Id: I6e230e42cbecd7d7e236e0a2bfe3ea6c3d4c54c3
 2019-11-21 11:58:24 -08:00
David Su
c4df6668bb Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID" 
am: 1124e240c0

Change-Id: Ia0c92f1db33b0a884da7388cd31b33d51df29288
 2019-11-21 11:50:57 -08:00
David Su
1124e240c0 Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID" 2019-11-21 18:44:46 +00:00
Chen Xu
da22ddac87 Merge "expose systemAPI for SmsCbLocation constructor" 
am: 174b988133

Change-Id: Id44432a314e2becf72818f445120dbbe8367f9bc
 2019-11-21 09:49:17 -08:00
Chen Xu
174b988133 Merge "expose systemAPI for SmsCbLocation constructor" 2019-11-21 17:38:41 +00:00
Makoto Onuki
d52db070cd Merge "Explicitly take flags in createContextAsUser()" 
am: a7948ddcb9

Change-Id: I6947903d66da1e64c461a1557e82a72a97a8848b
 2019-11-21 08:05:06 -08:00
Treehugger Robot
a7948ddcb9 Merge "Explicitly take flags in createContextAsUser()" 2019-11-21 15:53:59 +00:00
satayev
677b6b6c3c Merge "Add OWNERS for frameworks/base/config/hiddenapi*." 
am: 2c3312dda8

Change-Id: Ic490a254f257edc2b826f87e23fa3228af2a5e3a
 2019-11-21 06:36:00 -08:00
satayev
2c3312dda8 Merge "Add OWNERS for frameworks/base/config/hiddenapi*." 2019-11-21 14:26:40 +00:00
Chalard Jean
28df771bd4 Merge "Cut the dependency to APN constants" 
am: 8f0513bd0b

Change-Id: I140f294e0b044c66b925ae5c8ae6f2859c694753
 2019-11-21 04:45:07 -08:00