drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
467,951 Commits 1 Branch 0 Tags
Commit Graph

467951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Taylor
c03117fdf4 Remove extraneous word in javadoc 
Test: comment change only
Bug: 149756626

Change-Id: Ifc6c91c471d250fa701270b568d3b666744bd303
 2020-02-19 16:18:57 -08:00
Danning Chen
2bed6dfd58 Merge "Keep the event information in EventIndex for at most 63 days instead of 64 days" 2020-02-19 23:36:03 +00:00
Automerger Merge Worker
cc5a5939a0 Merge "Revert "Revert "[DexLoadReporter] Report classloader contexts di..."" am: 1ee3e70cf3 am: 2cef69cb5f am: a2c3c9fe10 
Change-Id: I6d7ba01f4083ed01eea0ec0dda0b69f27a4b1346
 2020-02-19 23:19:40 +00:00
Automerger Merge Worker
0a04056d35 Merge "IMS: Add support for IMS Explicit call transfer" am: 12f7f43ec8 am: 4c0cd62311 am: f65d00890f 
Change-Id: Ic8231acd8330c91998f0cb479a7a6fbe3ea5bda1
 2020-02-19 23:19:00 +00:00
Automerger Merge Worker
e58877eacd Merge "Rename KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL." am: 10f01e3c4c am: 32cdb7dcbb am: 9ca6a4957e 
Change-Id: I029ad994232397a64b2f2b32e84adfeb5d12917f
 2020-02-19 23:17:28 +00:00
Automerger Merge Worker
63184e0b4a Merge "Clarify getSmsCapacityOnIcc docs." am: c2ea5a5bcb am: 0624828d41 am: fa4e1eb407 
Change-Id: I60f439f3e07bc694699e688b817d1c2950a4f488
 2020-02-19 23:17:08 +00:00
Automerger Merge Worker
9c2fae46a9 Merge "Made the comment more clear" am: 5bb8151a47 am: d41acbdab8 am: 730f2ff7de 
Change-Id: Ie4044843b40beb670ceab777c5b9906a19bb2d1c
 2020-02-19 23:16:32 +00:00
Automerger Merge Worker
f49cd396c8 [automerger skipped] Merge "Add cutout support in QSDetail" into qt-qpr1-dev am: 79a42a6cf9 am: 07dd2677e6 -s ours 
am skip reason: Change-Id I665c8c76a2a057e9a30bce7c28fdbe7a249bb5c2 with SHA-1 dcd3b3b714 is in history

Change-Id: Ic10ae08dc6c9cde4368aeeb42237359b17e92b3c
 2020-02-19 23:15:56 +00:00
Automerger Merge Worker
14b5b84322 [automerger skipped] Merge "Enable compat checking & lint for system_services api" am: b14743ce82 am: 34aaecf48c am: 905982888c -s ours 
am skip reason: Change-Id Ib4cbc84ac9a826f7b947c951c94f8f5578f4554d with SHA-1 daa9d88444 is in history

Change-Id: Ibb5f2c494b75285fc17653b94189bac1fe8897f1
 2020-02-19 23:15:22 +00:00
Automerger Merge Worker
3979a56060 Merge "Rename ro.device_owner system property" am: 075c6b9db7 am: 3cf8f19dc4 am: 4b8545b3fb 
Change-Id: Iad0b91c0b37e1e4c22ea3b2754b96e21b3fa427b
 2020-02-19 23:14:24 +00:00
Automerger Merge Worker
3f9f6f42bd Merge "Update javadoc of deprecated UICC APIs" am: e73b46c9d9 am: e33a7cb5c3 am: 606159f661 
Change-Id: I9b6d18c35bb77d4f7b39a4b11ace679480388b58
 2020-02-19 23:14:02 +00:00
Automerger Merge Worker
42be9e5186 [automerger skipped] Merge "Enable compat checking & lint for module_lib api" am: 0e9166f15b am: 5116697dce am: d969d21482 -s ours 
am skip reason: Change-Id I2b171dc836ca121502fb345d8dd512a05c566a49 with SHA-1 79e35c3beb is in history

Change-Id: Ided72d42e9230844407fa4cd0c59d70508027f68
 2020-02-19 23:13:37 +00:00
Automerger Merge Worker
7e66d1c563 Merge "Merge "Key revocation check is permissive when device is unlocked" am: a9384cdc9b am: 3f638d9a3f" into qt-qpr1-dev-plus-aosp am: 5882228ab8 
Change-Id: I39879ca88d139e51e71f2fa7050ff2ee5a67b96b
 2020-02-19 23:13:15 +00:00
Automerger Merge Worker
74ca3b31d4 [automerger skipped] Merge "Add vertical type check to prevent non-Automotive Androids from force displaying system bars." into qt-qpr1-dev am: 5a846ed237 am: 27e9268447 -s ours 
am skip reason: Change-Id Ia433572650760e3b85954724c63084dca769eaa0 with SHA-1 aff09ea932 is in history

Change-Id: Idfded0d0172b72b7704baa4f58ec10cfb76076a9
 2020-02-19 23:12:34 +00:00
Automerger Merge Worker
9330d30efc Merge "Tethering offload: add/remove IPv6 forwarding rules on ND events." am: 0568756e6e am: 8d78f124e7 am: 2353495350 
Change-Id: If7947436f2a26786f69377712ad0ff1234ac93fe
 2020-02-19 23:12:04 +00:00
Automerger Merge Worker
a3808a7c51 Merge "Minimal support for IPv6 upstreams in IpServer tests." am: fc7d7b5f0f am: 21d63cba5b am: 954d0c274f 
Change-Id: Iba46592442663cdc9b69aa2c5cb1ea0893f8f087
 2020-02-19 23:11:42 +00:00
Automerger Merge Worker
6e66cb5679 Merge "Reduce advertised ipv6 mtu by 16 to fit ethernet header" am: b1ad41b62e am: 376e086fef am: f0fff78d9d 
Change-Id: I2ce8d87603b1628735b376efe21da43d3ea53225
 2020-02-19 23:11:06 +00:00
Automerger Merge Worker
6bf78e07a1 Merge "Check DSU public key with key revocation list" am: 3bdf29c1f6 am: 55e1510484 am: e6a75b64f4 
Change-Id: Ia0ddcd71ec72531d24f9475a044bde7134768e20
 2020-02-19 23:10:35 +00:00
Automerger Merge Worker
6630da4947 [automerger skipped] Merge "Add tethering client callbacks" am: 195fc89155 am: 6b281c9304 am: 3883a5ce7b -s ours 
am skip reason: Change-Id I96291038cf7b39a67547a5f74fcd7cbedc1ca002 with SHA-1 43b0e5c6c7 is in history

Change-Id: I046ad2de1e65468df9f70f189abfa1162f15a7c0
 2020-02-19 23:10:08 +00:00
Automerger Merge Worker
eaaa9dd36e [automerger skipped] Merge "Fix usage of annotations in TetheringLib" am: 91bb789c20 am: a4dbd9a897 am: 3cea47c781 -s ours 
am skip reason: Change-Id I1fae97a1c1e0ba07fa3e2d64cde7650cd26d0acd with SHA-1 eb22daaf5b is in history

Change-Id: Ifdfeae4e43afd3892ced4964d54e532a1f46e8fc
 2020-02-19 23:09:45 +00:00
Automerger Merge Worker
6fabe93b73 [automerger skipped] Merge "Use framework-tethering-stub instead of framework-tethering" am: 3e4ab5c2b5 am: 101b4e2bb5 am: 42dbff65d6 -s ours 
am skip reason: Change-Id I97ef83f7f9b4c1376f373713036f5256318f1050 with SHA-1 2c153703e4 is in history

Change-Id: I1771917998eeda2d18abb1f576e5091828651ea0
 2020-02-19 23:09:23 +00:00
Automerger Merge Worker
802b7efa3e Merge "Add TetheringTests to postsubmit" am: a0c1281870 am: 2d89fa53d3 am: b9a8a92364 
Change-Id: I6597bb11941d92f222e8dc0a4edf1e9f8e2a5fde
 2020-02-19 23:09:00 +00:00
Automerger Merge Worker
0bdf785b96 Merge changes from topic "settings-vpn" am: 70f90282ef am: ff39b8ba90 am: 752013f696 
Change-Id: Idac6e83bab50b818e2776f28da380f08000e2a42
 2020-02-19 23:08:32 +00:00
Automerger Merge Worker
24862dd172 [automerger skipped] Add always-on VPN support for platform VPNs am: 522f3c932d am: 7deb069d3d am: 623f094210 -s ours 
am skip reason: Change-Id I5eda88e5b406a0e425eb7424665cf702e0979324 with SHA-1 b570e8654d is in history

Change-Id: Id27267529b42f1b1be90613574f91e5fe7c780e4
 2020-02-19 23:08:21 +00:00
Automerger Merge Worker
e94ac536ec Merge "USB: [API feedback] Add bitmask @IntDef annonation to setCurrentFunctions" am: 2f9800a47d am: 65de31ca5d am: bac02c1de2 
Change-Id: I3dd8104d264a423b19ccfe8affc4a2f4de58b101
 2020-02-19 23:07:54 +00:00
Automerger Merge Worker
4471500ebe Merge "Add AdbTransportType.aidl. Add AdbWifi internal API stubs." am: c5cb13899d am: 44cf122df0 am: 21e272d52e 
Change-Id: Ic09de8f7f6a064ccfa11654f7a5833b1ebfa490a
 2020-02-19 23:07:19 +00:00
Automerger Merge Worker
35ce823dff [automerger skipped] Merge "Declare a public field for new Japanese Era Reiwa" am: 857636e059 am: 191127c556 am: b79f0c4c12 -s ours 
am skip reason: Change-Id I1cbc9a12744d3cea214ee3b4a2872a9ad144e147 with SHA-1 f9258ccc07 is in history

Change-Id: I2d64d68e3b810e18327a2acb08b4e9ca5816d1ed
 2020-02-19 23:06:13 +00:00
Automerger Merge Worker
2a68279332 Merge "[SP15] Remove unused getVtDataUsage in TelephonyMananger" am: 7e0dbc53e3 am: 5f0be54993 am: a61f378be4 
Change-Id: I4cb5598176ccce3d7d9f5dcdc47a8ed9210f00ed
 2020-02-19 23:05:23 +00:00
Automerger Merge Worker
fec0d008c4 [automerger skipped] Merge "[adbwifi] Add settings event for opening adb device details." am: 085565313b am: 04f1c4267b am: 2aeef3b8cf -s ours 
am skip reason: Change-Id I8927e3f106b9cdaebe95ec56c675704baa1d1542 with SHA-1 1d45ee6491 is in history

Change-Id: I4aab963b8a032ebebdca288c093b197dc7143e68
 2020-02-19 23:04:46 +00:00
Automerger Merge Worker
0ef52b1bc8 [automerger skipped] Merge "DO NOT MERGE Dismiss system dialog" into qt-qpr1-dev am: e59b568ac4 am: 725617e9a4 -s ours 
am skip reason: subject contains skip directive

Change-Id: I615316058635927da4910dadbab6bc08ff165ef8
 2020-02-19 23:03:46 +00:00
Automerger Merge Worker
21a9a719d3 [automerger skipped] DO NOT MERGE Dismiss system dialog am: 07af69531c am: fcbb0e0faa -s ours 
am skip reason: subject contains skip directive

Change-Id: I4da90aaac0847e635afb8afdb31c2d96f0b190f5
 2020-02-19 23:03:42 +00:00
Automerger Merge Worker
d9aedbc047 Merge "[SP12] Remove the usage of getVtDataUsage" am: cde5e170b0 am: 565f09f97c am: b585c1cc78 
Change-Id: I28c84ee96a3a209868769aad16a2d2e596a0c342
 2020-02-19 23:02:38 +00:00
Automerger Merge Worker
7e89e2d82b [automerger skipped] Merge "Improve BaseBundle#kindofEquals" am: 42ab50d14b am: 1f82fbb4ac am: 893bf3b7f5 -s ours 
am skip reason: Change-Id I04c28cdd1293227d9887b0c17e178f61328c1959 with SHA-1 0e8c9c4daa is in history

Change-Id: I38fb654c39b463e1a0e81c4158d16f27fb89a6b3
 2020-02-19 23:02:15 +00:00
Khaled Abdelmohsen
a15d8009fb Merge "Create rule atom for source stamp" 2020-02-19 23:00:54 +00:00
Automerger Merge Worker
8244b6849a [automerger skipped] Merge "Separate icon sizes for sharesheet and resolver list." into qt-qpr1-dev am: f51ae98a50 am: 3e2818affd -s ours 
am skip reason: skipped by user ccross

Change-Id: I14e79be17c4e0afebc0e4dc3248fd2d416c70e2d
 2020-02-19 22:59:29 +00:00
Ytai Ben-tsvi
7855324ee5 Merge "Enforce HAL callbacks" 2020-02-19 22:45:40 +00:00
Julia Reynolds
9d93649bad Merge "Be more strict about what sounds can play in DND" 2020-02-19 22:42:46 +00:00
Khaled Abdelmohsen
41456aa99c Create rule atom for source stamp 
Bug: 149200249
Test: atest FrameworksCoreTests:IntegrityFormulaTest
Change-Id: I8a5ca33e8b2b125a8b7bc178557b7689c0eab50d
 2020-02-19 22:41:16 +00:00
Feng Cao
6c821f6ea1 Merge "Introduces the Bundle to inline suggestions APIs to encode custom UI styling information." 2020-02-19 22:35:42 +00:00
Michael Groover
117da2461a Merge "Update the getIccId docs to reflect access requirements" 2020-02-19 22:22:45 +00:00
Automerger Merge Worker
7995915661 Merge "RingtoneManager: Don't crash if the ringtone doesn't have a numerical ID" am: ff78aab391 am: 0396aae65b am: ac23b2292d 
Change-Id: Id6d7ff358769c86fab311b5b1161e8916169212e
 2020-02-19 22:17:45 +00:00
Sudheer Shanka
3e66066440 Merge "Don't error out if the index files are not available." 2020-02-19 22:17:22 +00:00
Automerger Merge Worker
ed67786e6b Merge "Consume health HAL 2.1 values from framework" am: 217aadd0c2 am: 28c43860ea am: 8f9d77ae03 
Change-Id: I60f9cee5e0ba74349a0448204b0e31d213151e5f
 2020-02-19 22:16:25 +00:00
Winson Chiu
633cd037f7 Merge changes from topics "package-parsing-v2.1", "parsing-parsed-package-split" 
* changes:
  Remove AndroidPackageWrite
  Migrate to new ParsedComponents and ParseResult
  Split ParsedComponents
  Add ParseResult infrastructure
  ParsingPackage/ParsedPackage test code migration
  ParsingPackage/ParsedPackage split source migration
  Important migration for new ParsingPackage/ParsedPackage split
  Separate ParsingPackage into core and ParsedPackage into server
 2020-02-19 22:16:15 +00:00
Automerger Merge Worker
d3e581f7c6 [automerger skipped] Merge "Add encoding information to TvTrackInfo" am: f3681741e3 am: e982fa4084 am: 9764563966 -s ours 
am skip reason: skipped by user nchalko

Change-Id: Ibfc92e45b9b1cf22346b198b75611fcb1732de7c
 2020-02-19 22:15:32 +00:00
Igor Murashkin
c4156d8da7 Merge "pinner: Replace camera pinning with iorap prefetching" 2020-02-19 22:10:40 +00:00
Bohdan Petrivskyy
7f1264e629 Merge "Removes redundant @SystemApi for registerMonitorCallback and from MONITOR_DEVICE_CONFIG_ACCESS permission declaration." 2020-02-19 22:07:00 +00:00
Beth Thibodeau
57bda3c2fa Merge "Adding unit tests" 2020-02-19 22:03:45 +00:00
TreeHugger Robot
205a16abfb Merge "Move inflation-related NEM tests to their own file" 2020-02-19 21:47:57 +00:00
Danning Chen
6fb9750619 Keep the event information in EventIndex for at most 63 days instead of 64 days 
Bug: 149758587
Bug: 146522621
Test: atest com.android.server.people.data.EventIndexTest
Change-Id: I0cae2a5c958d88aab9f76a7ee198fc2e6d69971c
 2020-02-19 21:40:06 +00:00