Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
378,146 Commits 3 Branches 0 Tags
7904f65506f04438cc5d857310b2218340225eec
Commit Graph

378146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7904f65506 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 6a781ba866  -s ours

Change-Id: Idd0b306aa3d756ac3ca5b00db5f07c044fb7595a
 2018-10-14 21:26:58 -07:00
Bill Yi
6013922014 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 3db4ae0fbd  -s ours

Change-Id: I20a71172cf88b798ede97c1fdfa7f8a51cfe92f3
 2018-10-14 21:25:49 -07:00
TreeHugger Robot
6a781ba866 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-15 04:11:20 +00:00
TreeHugger Robot
3db4ae0fbd Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-15 04:09:39 +00:00
Bill Yi
d9c4bdebc2 Import translations. DO NOT MERGE 
Change-Id: Ic5bdd5ce441a8ca3c829a8041e3b1b0fac436e5d
Auto-generated-cl: translation import
 2018-10-14 19:42:52 -07:00
Bill Yi
46d51d735e Import translations. DO NOT MERGE 
Change-Id: I3018993cf2fa01894d53d95af6f9f658b589cabe
Auto-generated-cl: translation import
 2018-10-14 19:20:06 -07:00
Sundong Ahn
818de8233e Merge "Build com.android.media.remotedisplay with java_sdk_library" am: 1ad4aed0b9 
am: a1bc1b1331

Change-Id: I4fff5350c7ae997f5db3f2e3b88bec8bdbe53d90
 2018-10-14 18:57:12 -07:00
Sundong Ahn
a1bc1b1331 Merge "Build com.android.media.remotedisplay with java_sdk_library" 
am: 1ad4aed0b9

Change-Id: Icb633bd7f8cc0ed932c0aa70ef9dfe475722ada0
 2018-10-14 18:48:01 -07:00
Treehugger Robot
1ad4aed0b9 Merge "Build com.android.media.remotedisplay with java_sdk_library" 2018-10-15 01:32:16 +00:00
Tobias Thierer
523765542d Merge "Drop unused libcore.io imports." am: 58d5c1e938 
am: 66234e3975

Change-Id: I9d48b9ae7ed1e05734110ca0dad8db8a6d743add
 2018-10-13 07:17:11 -07:00
Tobias Thierer
66234e3975 Merge "Drop unused libcore.io imports." 
am: 58d5c1e938

Change-Id: Ifba36af79c08f93ed562908fb2a5db35aea3cb13
 2018-10-13 07:10:47 -07:00
Tobias Thierer
58d5c1e938 Merge "Drop unused libcore.io imports." 2018-10-13 13:08:13 +00:00
Tobias Thierer
320e38309b Merge "Remove unused imports of libcore.io.Libcore." am: 2a520365da 
am: abe7a32c67

Change-Id: I57d7d317f5827a54346e287db3f6f2d625e0aebc
 2018-10-12 19:13:38 -07:00
Nan Zhang
be558d6e58 Merge "Enable lint_as_errors for frameworks/base docs" am: 6622d0957d 
am: dd298a4b0f

Change-Id: I0aa3f754d172c4d07c55cc04cac03744b9183e58
 2018-10-12 19:00:45 -07:00
Tobias Thierer
abe7a32c67 Merge "Remove unused imports of libcore.io.Libcore." 
am: 2a520365da

Change-Id: I79c4679d483e0e8ea2e434237bd61d75f129da0f
 2018-10-12 18:59:21 -07:00
Tobias Thierer
eaabd9dc3e Drop unused libcore.io imports. 
This removes the last import of libcore.io.Libcore from frameworks.
This means that it can be safely hidden from frameworks in a follow-up
CL. Both of the unused imports in this CL were already removed on the
internal master branch (commit a05a994610),
but that commit doesn't cherry-pick cleanly onto AOSP master.

The IoUtils import also appears unused, but it wasn't touched by the
above CL so this CL also leaves it alone.

Bug: 117548625
Test: Treehugger
Change-Id: Icc68c64ef2907372af848d74d9cf96070c89d52b
 2018-10-13 02:07:02 +01:00
Chih-Hung Hsieh
0a6ca66a34 Merge "Fix implicit fallthrough warnings." am: 012692be3f 
am: 3515bf0fc9

Change-Id: Ia07a0a00d1ae547bc7af968e6f8a7caeb51f3e6e
 2018-10-12 18:05:24 -07:00
Nan Zhang
dd298a4b0f Merge "Enable lint_as_errors for frameworks/base docs" 
am: 6622d0957d

Change-Id: I9beb510137552ee73a4994683ffe86b775f5ad58
 2018-10-12 17:53:06 -07:00
Chih-Hung Hsieh
3515bf0fc9 Merge "Fix implicit fallthrough warnings." 
am: 012692be3f

Change-Id: I37a244c2e850d1247010d92b9e91b9c34df159f1
 2018-10-12 17:48:52 -07:00
Treehugger Robot
2a520365da Merge "Remove unused imports of libcore.io.Libcore." 2018-10-13 00:47:45 +00:00
Nan Zhang
6622d0957d Merge "Enable lint_as_errors for frameworks/base docs" 2018-10-13 00:19:45 +00:00
Treehugger Robot
012692be3f Merge "Fix implicit fallthrough warnings." 2018-10-12 23:37:23 +00:00
Chih-Hung Hsieh
6c5b82f7c5 Fix implicit fallthrough warnings. 
Test: make checkbuild
Bug: 112564944
Change-Id: Ia33bf816fb6b179ac0a5a6a20bcb50c11b47431d
 2018-10-12 15:05:01 -07:00
Nan Zhang
b03396ef2f Enable lint_as_errors for frameworks/base docs 
Add back various error/warning related args while running doclava for
frameworks/base docs.

Test: m -j docs
Bug: b/116163454
Change-Id: I9cbe3f0bd1b6acfe0b6e2c6567c78bb70f892c77
 2018-10-12 14:48:12 -07:00
Chen Xu
6169b04385 Merge "refactor data/voice roaming states" am: 6bd29ab2df 
am: 652ec06948

Change-Id: I1f82195e5477401f3216db92bbdac388bbe16c7f
 2018-10-12 11:32:19 -07:00
Chen Xu
652ec06948 Merge "refactor data/voice roaming states" 
am: 6bd29ab2df

Change-Id: Iac8184fe2dfdb7ff4c3d93ecb7c0c9dd9a7a46a5
 2018-10-12 11:20:18 -07:00
Jack He
94405bb133 Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am: 2ac8c8a3e2 
am: 24591d2641

Change-Id: Idc687ad7ea25b793f5ef12612e161e197d87679d
 2018-10-12 11:18:09 -07:00
Nandana Dutt
1d1184cf83 Merge "Add DumpstateOptions java implementation" am: 52502ef1a1 
am: 8a9f23c8a1

Change-Id: I392c2c6bdb522efa708b82174debf3a18167c0bc
 2018-10-12 11:07:59 -07:00
Jack He
24591d2641 Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" 
am: 2ac8c8a3e2

Change-Id: I8836294e7206c8e8c024f5b986c25b9cf2dd29d9
 2018-10-12 11:06:44 -07:00
Chen Xu
6bd29ab2df Merge "refactor data/voice roaming states" 2018-10-12 18:02:17 +00:00
Nandana Dutt
8a9f23c8a1 Merge "Add DumpstateOptions java implementation" 
am: 52502ef1a1

Change-Id: I18d5d73028a5ebfdf0ac13d141e20cc5356b61e1
 2018-10-12 10:58:16 -07:00
Treehugger Robot
2ac8c8a3e2 Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" 2018-10-12 17:35:14 +00:00
Nandana Dutt
52502ef1a1 Merge "Add DumpstateOptions java implementation" 2018-10-12 17:31:39 +00:00
Neil Fuller
ad3947bb43 Merge "Remove explicit dependencies on "core" libraries" am: 18f9a2c24d 
am: d252f61f66

Change-Id: Ia66748d28ecb846d190b9dacb004a734c11bc54c
 2018-10-12 03:22:04 -07:00
Neil Fuller
d252f61f66 Merge "Remove explicit dependencies on "core" libraries" 
am: 18f9a2c24d

Change-Id: I326380ec0c10f29c09c64f4044a9c79c9ab2648f
 2018-10-12 03:12:22 -07:00
Neil Fuller
18f9a2c24d Merge "Remove explicit dependencies on "core" libraries" 2018-10-12 09:49:03 +00:00
Chalard Jean
c877cf7df3 Merge "NetworkMonitor: add log of CaptivePortal result" am: 35d6512a5d 
am: 689f888627

Change-Id: Ibe0fbec44aa4dd52646e968d94021ddda0c05d39
 2018-10-12 02:48:02 -07:00
Chalard Jean
689f888627 Merge "NetworkMonitor: add log of CaptivePortal result" 
am: 35d6512a5d

Change-Id: Iab6aba7e4dab0cddc68b4e7ec5386e46f83a22f6
 2018-10-12 02:32:51 -07:00
Chalard Jean
f13ec866af Merge "[PT13] Simple cleanup of ProxyTracker." am: afa7fdabaa 
am: 0f81f1e332

Change-Id: I1e643d5be6d7f791c3bbe3ba018e6ad6717e3ddb
 2018-10-12 01:12:12 -07:00
Chalard Jean
35d6512a5d Merge "NetworkMonitor: add log of CaptivePortal result" 2018-10-12 07:57:35 +00:00
Chalard Jean
0f81f1e332 Merge "[PT13] Simple cleanup of ProxyTracker." 
am: afa7fdabaa

Change-Id: I6a30f78e517716ca3ff14a3601374fddc65e4aec
 2018-10-12 00:50:29 -07:00
Chalard Jean
afa7fdabaa Merge "[PT13] Simple cleanup of ProxyTracker." 2018-10-12 07:34:43 +00:00
Nan Zhang
ae15939492 Merge "Fix incorrect javadoc link" am: 293ab4941b 
am: d96fe8ddd0

Change-Id: I0331d98eb989ee429eb0ef38c448eae551130118
 2018-10-11 23:16:13 -07:00
Chalard Jean
4318ecef12 Merge "[PT12] Factor some code into ProxyTracker." am: f24b6c77a6 
am: 1a70721041

Change-Id: Ib4509788887df4c5c2ef017eb808a38dea0ae00b
 2018-10-11 23:10:48 -07:00
Nan Zhang
d96fe8ddd0 Merge "Fix incorrect javadoc link" 
am: 293ab4941b

Change-Id: Id288e51e79c867728e06caa8ee68bf28bd2dcbf5
 2018-10-11 22:59:08 -07:00
Jeff Sharkey
a305fbf85e [automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c am: 893598cd4b am: 7656e1177f -s ours 
am: 58d1ac473e

Change-Id: Ibd2f4fcb800b7a48e7b9313083c88b4441d02f7c
 2018-10-11 22:56:08 -07:00
Chalard Jean
1a70721041 Merge "[PT12] Factor some code into ProxyTracker." 
am: f24b6c77a6

Change-Id: Ib92107f434576d8296ba74aab0d9abfe56cefa7c
 2018-10-11 22:55:28 -07:00
Jeff Sharkey
607cdde9ae [automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac am: af72f01db8 am: 80c65f6ce7 am: cef9bae62d -s ours 
am: f85bd2b22d

Change-Id: I60947c277004dacba0169413def7f2bf9a0d6bf6
 2018-10-11 22:48:20 -07:00
Jeff Sharkey
58d1ac473e [automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c am: 893598cd4b 
am: 7656e1177f  -s ours

Change-Id: I95387eef7f018aceec664807c015eef768fbb4b3
 2018-10-11 22:20:54 -07:00
Jeff Sharkey
f85bd2b22d [automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac am: af72f01db8 am: 80c65f6ce7 
am: cef9bae62d  -s ours

Change-Id: I5e2cb1a4274d547cfcd18fc010063fa70f75090f
 2018-10-11 22:19:39 -07:00