OSDN Git Service
Colin Cross [Thu, 20 Apr 2017 19:20:20 +0000 (12:20 -0700)]
Convert libandroid and libandroid_runtime to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
(cherry picked from commit
3f8fd40f285dba5b3639ee1e3d4e4544048c1446)
Nathan Harold [Sat, 6 May 2017 00:48:58 +0000 (00:48 +0000)]
Merge "Move files from frameworks/opt/telephony to frameworks/base" into oc-dev-plus-aosp
Yifan Hong [Sat, 6 May 2017 00:42:05 +0000 (00:42 +0000)]
Merge changes from topic 'libvintf_cp' am:
9bd4c20764 am:
7fbbc2e85d
am:
31175a97b4 -s ours
Change-Id: I4dc312132d8c91e46de6fec7b944a8e42086577b
Yifan Hong [Sat, 6 May 2017 00:40:44 +0000 (00:40 +0000)]
Add compatibility matrices to VintfObject.report() am:
4463d991be am:
dd4156cb43
am:
c62e73c6a4 -s ours
Change-Id: Id96eb1c95e939fa91410a6f4b9c08fba41d593d7
Yifan Hong [Sat, 6 May 2017 00:28:09 +0000 (00:28 +0000)]
Merge changes from topic 'libvintf_cp' am:
9bd4c20764
am:
7fbbc2e85d
Change-Id: Id3ce69c9f0642b1aad8acb9512870b239e652e95
Yifan Hong [Sat, 6 May 2017 00:26:53 +0000 (00:26 +0000)]
Add compatibility matrices to VintfObject.report() am:
4463d991be
am:
dd4156cb43
Change-Id: I877107d04b96038592a8aaf2c79aecdd316318f2
Yifan Hong [Sat, 6 May 2017 00:18:51 +0000 (00:18 +0000)]
Merge changes from topic 'libvintf_cp'
am:
9bd4c20764
Change-Id: I277b37789fdc78ed2dcb5c50c1fda9c40444a4e8
Yifan Hong [Sat, 6 May 2017 00:17:26 +0000 (00:17 +0000)]
Add compatibility matrices to VintfObject.report()
am:
4463d991be
Change-Id: I26c78cca5e807ee291bdb097d11d5f4ac43bba29
Treehugger Robot [Sat, 6 May 2017 00:11:31 +0000 (00:11 +0000)]
Merge changes from topic 'libvintf_cp'
* changes:
android.os.VintfObject: add API for EDI.
Add compatibility matrices to VintfObject.report()
Ruben Brunk [Fri, 5 May 2017 23:52:14 +0000 (23:52 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" am:
612b8bef0c am:
0b34d001e4
am:
f4a9d362a8
Change-Id: I8827be128443902d7f614fdd275519723bd76dc0
Ruben Brunk [Fri, 5 May 2017 23:46:53 +0000 (23:46 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" am:
612b8bef0c
am:
0b34d001e4
Change-Id: Ie18a2a483bb08d924a93db4f7dd95c948a6fb323
Ruben Brunk [Fri, 5 May 2017 23:39:50 +0000 (23:39 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment"
am:
612b8bef0c
Change-Id: Ia71233576b7f8a712abf495164923a092cdc5677
Treehugger Robot [Fri, 5 May 2017 23:28:39 +0000 (23:28 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment"
Colin Cross [Fri, 5 May 2017 23:12:53 +0000 (23:12 +0000)]
Merge "Update path for libmediandk headers" am:
9d9aab48fa am:
d1d283692f
am:
5fa4ae0c33
Change-Id: Ia938c9e716d613bed3ed5b0903b4b937e2699987
Colin Cross [Fri, 5 May 2017 22:45:11 +0000 (22:45 +0000)]
Merge "Update path for libmediandk headers" am:
9d9aab48fa
am:
d1d283692f
Change-Id: I40746901ee18123838c6e50e429c178585566e32
Colin Cross [Fri, 5 May 2017 22:32:11 +0000 (22:32 +0000)]
Merge "Update path for libmediandk headers"
am:
9d9aab48fa
Change-Id: I339300d2e0c230069af0a7f08caff6449de37c85
Colin Cross [Fri, 5 May 2017 22:25:05 +0000 (22:25 +0000)]
Merge "Update path for libmediandk headers"
Ruben Brunk [Mon, 1 May 2017 23:57:31 +0000 (16:57 -0700)]
Fix Bluetooth GATT API default handler assignment
Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.
This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.
Bug:
37544152
Bug:
37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9
(cherry picked from commit
6bdc550e27e2c4e7b32bb91085eaac898d7d1156)
Android Build Merger (Role) [Fri, 5 May 2017 22:06:45 +0000 (22:06 +0000)]
Merge "Merge "android.os.VintfObject: add API for EDI." into oc-dev am:
718688f39b" into oc-dev-plus-aosp
Yifan Hong [Fri, 5 May 2017 22:05:08 +0000 (22:05 +0000)]
Merge "android.os.VintfObject: add API for EDI." into oc-dev
am:
718688f39b
Change-Id: I937b7972b40747e36b9fe3a2ff008c1052652962
Android Build Merger (Role) [Fri, 5 May 2017 22:03:33 +0000 (22:03 +0000)]
Merge "Merge "Remove duplicated onBackStackChanged() call." into oc-dev am:
c110c5edf4" into oc-dev-plus-aosp
George Mount [Fri, 5 May 2017 22:02:37 +0000 (22:02 +0000)]
Merge "Remove duplicated onBackStackChanged() call." into oc-dev
am:
c110c5edf4
Change-Id: Idfb0cc04edfbe2cb8ac96122ece8a0d1e00ab475
Android Build Merger (Role) [Fri, 5 May 2017 22:00:43 +0000 (22:00 +0000)]
Merge "Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev am:
7c95e968ad" into oc-dev-plus-aosp
Suprabh Shukla [Fri, 5 May 2017 21:59:49 +0000 (21:59 +0000)]
Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev
am:
7c95e968ad
Change-Id: I84049eea0c2aec1ed4e643bef0a4899890f80bf1
George Mount [Fri, 5 May 2017 21:53:54 +0000 (21:53 +0000)]
Merge "Remove duplicated onBackStackChanged() call." into oc-dev
am:
c110c5edf4
Change-Id: Iab69422e0f47c2f7bf83664948dc6accee7da52f
TreeHugger Robot [Fri, 5 May 2017 21:47:43 +0000 (21:47 +0000)]
Merge "android.os.VintfObject: add API for EDI." into oc-dev
Suprabh Shukla [Fri, 5 May 2017 21:47:14 +0000 (21:47 +0000)]
Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev
am:
7c95e968ad
Change-Id: I51173313438190befa4ad1905ae90d828faab358
TreeHugger Robot [Fri, 5 May 2017 21:42:55 +0000 (21:42 +0000)]
Merge "Remove duplicated onBackStackChanged() call." into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 21:42:54 +0000 (21:42 +0000)]
Merge "Merge "Merge changes from topic 'update-conscrypt' am:
c497348c74" into stage-aosp-master am:
da0363104c am:
56014efbfd" into oc-dev-plus-aosp
Kenny Root [Fri, 5 May 2017 21:42:03 +0000 (21:42 +0000)]
Merge "Merge changes from topic 'update-conscrypt' am:
c497348c74" into stage-aosp-master am:
da0363104c
am:
56014efbfd
Change-Id: I4576ade698e72dd1c5731a4cff92f1c36cdb6f05
Android Build Merger (Role) [Fri, 5 May 2017 21:41:37 +0000 (21:41 +0000)]
Merge "Merge "Improved dump() on Autofill UI." into oc-dev am:
1f74edd2d7" into oc-dev-plus-aosp
Android Build Merger (Role) [Fri, 5 May 2017 21:41:16 +0000 (21:41 +0000)]
Merge changes from topic 'am-
5af6dcdbe67049bb85b1929f4c3e828d' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'update-conscrypt' am:
c497348c74 am:
37607dfca6 am:
9172df0777
Track updates to Conscrypt am:
7fdce769c3 am:
0634c4f77f am:
4fd0b06ac7
Kenny Root [Fri, 5 May 2017 21:39:42 +0000 (21:39 +0000)]
Merge changes from topic 'update-conscrypt' am:
c497348c74 am:
37607dfca6
am:
9172df0777
Change-Id: I6af7c373f22dace57c9719361104493178e08bd5
Kenny Root [Fri, 5 May 2017 21:38:30 +0000 (21:38 +0000)]
Track updates to Conscrypt am:
7fdce769c3 am:
0634c4f77f
am:
4fd0b06ac7
Change-Id: Ie543058742d47ecfdf645134c7165686318f9526
Felipe Leme [Fri, 5 May 2017 21:37:34 +0000 (21:37 +0000)]
Merge "Improved dump() on Autofill UI." into oc-dev
am:
1f74edd2d7
Change-Id: Ic590ec7047a832f067391fa29d85e68d09a27c60
Kenny Root [Fri, 5 May 2017 21:33:39 +0000 (21:33 +0000)]
Merge changes from topic 'update-conscrypt' am:
c497348c74 am:
37607dfca6
am:
9172df0777
Change-Id: I78b96e5ae3231185a1b26e2e8b9f95881c279de0
Kenny Root [Fri, 5 May 2017 21:32:28 +0000 (21:32 +0000)]
Track updates to Conscrypt am:
7fdce769c3 am:
0634c4f77f
am:
4fd0b06ac7
Change-Id: I39c4532965db9a154657e7f90ff6a5b1ebb84a35
Suprabh Shukla [Fri, 5 May 2017 21:32:12 +0000 (21:32 +0000)]
Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 21:28:05 +0000 (21:28 +0000)]
Merge "Improved dump() on Autofill UI." into oc-dev
Kenny Root [Fri, 5 May 2017 21:25:56 +0000 (21:25 +0000)]
Merge "Merge changes from topic 'update-conscrypt' am:
c497348c74" into stage-aosp-master
am:
da0363104c
Change-Id: I2fd2dc2d580de6423111de1674b3999d87542878
Kenny Root [Fri, 5 May 2017 21:19:11 +0000 (21:19 +0000)]
Merge changes from topic 'update-conscrypt' am:
c497348c74
am:
37607dfca6
Change-Id: Iaa67f9512dd0447487b42d655c03c3c445068837
Android Build Merger (Role) [Fri, 5 May 2017 21:18:53 +0000 (21:18 +0000)]
Merge "Merge changes from topic 'update-conscrypt' am:
c497348c74" into stage-aosp-master
Kenny Root [Fri, 5 May 2017 21:18:09 +0000 (21:18 +0000)]
Track updates to Conscrypt am:
7fdce769c3
am:
0634c4f77f
Change-Id: I9cdad70a06353e3451cc3c1d4e1237f42b91fa24
Kenny Root [Fri, 5 May 2017 21:16:47 +0000 (21:16 +0000)]
Merge changes from topic 'update-conscrypt'
am:
c497348c74
Change-Id: Ifa261c6c003f3e0ca767356bc98c2c3033bd699a
Kenny Root [Fri, 5 May 2017 21:10:11 +0000 (21:10 +0000)]
Merge changes from topic 'update-conscrypt'
am:
c497348c74
Change-Id: Ie3b9d74ff46be9e4b00c6efe6748feb5e096cd3a
Hyunyoung Song [Fri, 5 May 2017 21:09:23 +0000 (21:09 +0000)]
Merge "Fix issue in InsetDrawable where master inset attribute get ignored. Test: builds, and did manual test b/
37752336" into oc-dev
am:
52eba0ad70
Change-Id: I0bf917bccbd2747ea18049577f5d79fe457eea4f
Kenny Root [Fri, 5 May 2017 21:08:48 +0000 (21:08 +0000)]
Track updates to Conscrypt
am:
7fdce769c3
Change-Id: I691f1ed588814311363f67b8ce43cbe247e54b71
Kenny Root [Fri, 5 May 2017 21:00:38 +0000 (21:00 +0000)]
Merge changes from topic 'update-conscrypt'
* changes:
Delete obsolete and unused KeyStoreTests
Track updates to Conscrypt
Hyunyoung Song [Fri, 5 May 2017 20:52:48 +0000 (20:52 +0000)]
Merge "Fix issue in InsetDrawable where master inset attribute get ignored. Test: builds, and did manual test b/
37752336" into oc-dev
Abodunrinwa Toki [Fri, 5 May 2017 20:35:04 +0000 (20:35 +0000)]
Merge "Reject smart selection if outside original selection." into oc-dev
am:
6dcae2b91f
Change-Id: I34bd3e3833d5d7cd52264a5aa34bee18c51bb095
Akira Oshimi [Fri, 5 May 2017 20:32:52 +0000 (20:32 +0000)]
Merge "Update carrier text when phone service state is changed" into oc-dev
am:
ea4e770ed9
Change-Id: I0f385dd77dd42d1ad8ddc3784c0b5c8d1181a596
TreeHugger Robot [Fri, 5 May 2017 20:29:27 +0000 (20:29 +0000)]
Merge "Reject smart selection if outside original selection." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 20:25:44 +0000 (20:25 +0000)]
Merge "Update carrier text when phone service state is changed" into oc-dev
Makoto Onuki [Fri, 5 May 2017 20:16:49 +0000 (20:16 +0000)]
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev
am:
9ccb15a351
Change-Id: I7f246f362b6e8d124416db790e4856e52baa21b8
Rebecca Silberstein [Fri, 5 May 2017 20:11:22 +0000 (20:11 +0000)]
Merge "WifiManagerTest: alt way to check callback" into oc-dev
am:
52fbde5255
Change-Id: I6aaf92372ec62b1d7775492b56ac908f09cf056f
Makoto Onuki [Fri, 5 May 2017 20:11:02 +0000 (20:11 +0000)]
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev
Colin Cross [Fri, 5 May 2017 00:58:11 +0000 (17:58 -0700)]
Update path for libmediandk headers
Platform usages of libmediandk headers are now in media/.
Test: builds
Change-Id: I16385cab86ae9cac225304557df416bbb232ecf3
(cherry picked from commit
c8ed45d38f3b42e06c9e0980e133a84181752b5e)
TreeHugger Robot [Fri, 5 May 2017 20:04:14 +0000 (20:04 +0000)]
Merge "WifiManagerTest: alt way to check callback" into oc-dev
Colin Cross [Fri, 5 May 2017 00:58:11 +0000 (17:58 -0700)]
Update path for libmediandk headers
Platform usages of libmediandk headers are now in media/.
Test: builds
Change-Id: I16385cab86ae9cac225304557df416bbb232ecf3
(cherry picked from commit
c8ed45d38f3b42e06c9e0980e133a84181752b5e)
Todd Kennedy [Fri, 5 May 2017 19:56:16 +0000 (19:56 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev
am:
4804e41574
Change-Id: I181cb62756b16971b126c2174eea58788dd5bfea
Sergey Vasilinets [Fri, 5 May 2017 19:51:04 +0000 (19:51 +0000)]
Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev
am:
01a5cc9004
Change-Id: I52ea2290a175df2dcd5b3805f7e5943e387133da
TreeHugger Robot [Fri, 5 May 2017 19:35:22 +0000 (19:35 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev
Sergey Vasilinets [Fri, 5 May 2017 19:31:47 +0000 (19:31 +0000)]
Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev
Daniel Nishi [Fri, 5 May 2017 19:16:56 +0000 (19:16 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
am:
4e9002e69a
Change-Id: Ief5f223fd09e6cb78e903276a2270c6fbae2e0cf
Amith Yamasani [Fri, 5 May 2017 19:15:05 +0000 (19:15 +0000)]
Merge "Update process state after unbinding a service." into oc-dev
am:
f57b93cd0a
Change-Id: I9d880df13dec03cf5604c197c5bc4ee99a455693
Android Build Merger (Role) [Fri, 5 May 2017 19:11:26 +0000 (19:11 +0000)]
Merge "Merge "Reduce hwui CPU time by using glDrawRangeElements" am:
057c7c3164 am:
94f4f5e45f am:
b5facc7516" into oc-dev-plus-aosp
Arun [Fri, 5 May 2017 19:10:21 +0000 (19:10 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements" am:
057c7c3164 am:
94f4f5e45f
am:
b5facc7516
Change-Id: I9e96bf83ae5ebd4237fc4d78a58e83793de86aad
Seigo Nonaka [Fri, 5 May 2017 19:05:18 +0000 (19:05 +0000)]
Merge "Resolve styles by font table if not specified." into oc-dev
am:
1ea3a2600b
Change-Id: I8c99a582e4453ec0dfbe6e30650b6682f68e255a
Arun [Fri, 5 May 2017 19:04:45 +0000 (19:04 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements" am:
057c7c3164
am:
94f4f5e45f
Change-Id: I163bfb74ded3d7eacc5221980733099ca1d90002
Geoffrey Pitsch [Fri, 5 May 2017 19:01:40 +0000 (19:01 +0000)]
Merge "Revert "Treat apps that use channels as O apps"" into oc-dev
am:
e2361d978b
Change-Id: I3364dd67095ffcf25a4d33e0c25cc93d2cc7aa50
Arun [Fri, 5 May 2017 18:58:47 +0000 (18:58 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements"
am:
057c7c3164
Change-Id: I32269ea47f637597efc73acc4e040c209b48a2ed
Daniel Nishi [Fri, 5 May 2017 18:57:41 +0000 (18:57 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
Ajay Panicker [Fri, 5 May 2017 18:55:41 +0000 (18:55 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev
am:
73971b2a43
Change-Id: I899cf09b716c4b28c829f96e15760a897d45e293
TreeHugger Robot [Fri, 5 May 2017 18:51:56 +0000 (18:51 +0000)]
Merge "Update process state after unbinding a service." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 18:51:21 +0000 (18:51 +0000)]
Merge "Resolve styles by font table if not specified." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 18:50:52 +0000 (18:50 +0000)]
Merge "Revert "Treat apps that use channels as O apps"" into oc-dev
Treehugger Robot [Fri, 5 May 2017 18:50:11 +0000 (18:50 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements"
Ajay Panicker [Fri, 5 May 2017 18:45:08 +0000 (18:45 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev
Akira Oshimi [Tue, 31 Jan 2017 05:34:59 +0000 (14:34 +0900)]
Update carrier text when phone service state is changed
The carrier text is not updated when the phone service state has
changed. To solve this issue, the EmergencyCryptkeeperText view should
receive the KeyguardUpdateMonitorCallback#onRefreshCarrierInfo().
Bug:
37331677
Test: visual
Change-Id: I359991688552b731eaa02f443902eb7bdc894d10
(cherry picked from commit
76c36c4dc5eb2195c918590b23c16f6410a52df0)
Winson Chung [Fri, 5 May 2017 18:11:46 +0000 (18:11 +0000)]
Merge "Fixing regression in what is considered a restart attempt" into oc-dev
am:
9fb50954e1
Change-Id: Iecb3788c10b4a5dbac5ed0a741fe04a2950d1033
Rebecca Silberstein [Tue, 2 May 2017 20:21:00 +0000 (13:21 -0700)]
WifiManagerTest: alt way to check callback
We are seeing failures on automated tests. This is occuring when the
thread id is retrieved from the TestLooper. Since we do not have
control over exactly which thread is used in the TestLooper for these
environments, this CL changes the checks to make sure the the callback
is called, and also that we never attempt to get the main looper (the
behavior when the provided handler is null).
Bug:
37828843
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I853c423b5f383225c250357d638c4cfd2c098edc
TreeHugger Robot [Fri, 5 May 2017 18:03:49 +0000 (18:03 +0000)]
Merge "Fixing regression in what is considered a restart attempt" into oc-dev
Abodunrinwa Toki [Fri, 5 May 2017 17:55:41 +0000 (17:55 +0000)]
Merge "TextClassifier: Remove debug logs." into oc-dev
am:
dc4fc1ebc2
Change-Id: Ie5d929f463a1917f4e9d4f83e32ba95f359d041a
TreeHugger Robot [Fri, 5 May 2017 17:49:38 +0000 (17:49 +0000)]
Merge "TextClassifier: Remove debug logs." into oc-dev
Todd Kennedy [Fri, 5 May 2017 17:15:38 +0000 (17:15 +0000)]
Create auxiliary info for local instant apps
This reverts commit
a1d8051fa2317d897a6b20442177e357172e93db.
Change-Id: Ic471a4efe64406dd75cc0bf1d6464276a94347d8
Fixes:
37947648
Test: Manual
Test: Install an instant app [https://www.nytimes.com/crosswords/game/mini]
Test: Try to run installed instant app from gMail
Wei Wang [Fri, 5 May 2017 17:23:35 +0000 (17:23 +0000)]
Merge "Add wifi throttling to backup blacklist." into oc-dev
am:
2cd2d23440
Change-Id: Ibfa48a05769784cf688e5b35695c3a8369ac263c
TreeHugger Robot [Fri, 5 May 2017 17:15:48 +0000 (17:15 +0000)]
Merge "Add wifi throttling to backup blacklist." into oc-dev
Abodunrinwa Toki [Fri, 5 May 2017 17:07:17 +0000 (18:07 +0100)]
Reject smart selection if outside original selection.
- The aim is to be defensive and prefer to reject a selection if
it is likely to be wrong.
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug:
38019270
Change-Id: I35ebc84fb102373949366296434a31d899edfef3
Daniel Sandler [Fri, 5 May 2017 17:01:07 +0000 (17:01 +0000)]
Merge "Make status bar disable() debugging more concise." into oc-dev
am:
e39fa61e0b
Change-Id: I13a6417ab49e03a8c636740d59068dd5dc7d702d
Geoffrey Pitsch [Fri, 5 May 2017 16:47:38 +0000 (16:47 +0000)]
Revert "Treat apps that use channels as O apps"
This reverts commit
07a08b2ae92cc26b5e7ec00064e6ecea79d3d9c3.
Bug:
38016678
Change-Id: I0bf2f6da9e145bfe1f79449cac38ad34f5956969
Daniel Sandler [Fri, 5 May 2017 16:46:51 +0000 (16:46 +0000)]
Merge "Make status bar disable() debugging more concise." into oc-dev
Bryce Lee [Fri, 5 May 2017 16:46:20 +0000 (16:46 +0000)]
Merge "Prevent NPE in ActivityStack#shouldbeVisible." into oc-dev
am:
a087127e77
Change-Id: I3c8bfb7fb2961dfef71b7903f78d20ff21f0dc84
Geoffrey Pitsch [Fri, 5 May 2017 16:36:21 +0000 (16:36 +0000)]
Merge "Fix settings test for show_notification_channel_warnings" into oc-dev
am:
2d2689add7
Change-Id: Iac6657120054846aafff07b2335b631e350a7445
Seigo Nonaka [Thu, 4 May 2017 23:39:28 +0000 (16:39 -0700)]
Resolve styles by font table if not specified.
android:fontStyle and android:fontWeight is an optional attribute.
If they are missing, we are using non-italic 400 weight, but this is
not good idea. We should resolve these style value from font metadata.
Bug:
37988154
Test: am instrument -w -e class android.content.res.cts.ResourcesTest
android.content.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I80a436cd3632d8c58fa3d8bdaedac73b95f61a8c
Bryce Lee [Fri, 5 May 2017 16:29:37 +0000 (16:29 +0000)]
Merge "Prevent NPE in ActivityStack#shouldbeVisible." into oc-dev
Rebecca Silberstein [Fri, 5 May 2017 16:23:54 +0000 (16:23 +0000)]
Merge "WifiManagerTest: test for startLOHS return code" into oc-dev
am:
f8d909c14a
Change-Id: I0f43de95419ba442d53b676f1129f0782d2aac71
TreeHugger Robot [Fri, 5 May 2017 16:20:53 +0000 (16:20 +0000)]
Merge "Fix settings test for show_notification_channel_warnings" into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 16:20:19 +0000 (16:20 +0000)]
Merge "Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev am:
97258cd731" into oc-dev-plus-aosp
TreeHugger Robot [Fri, 5 May 2017 16:16:31 +0000 (16:16 +0000)]
Merge "Add (disabled) time zone update system server impl" into oc-dev-plus-aosp
Eino-Ville Talvala [Fri, 5 May 2017 16:14:14 +0000 (16:14 +0000)]
Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev
am:
97258cd731
Change-Id: I1dc7bb61cbf636301aa12070732aff095ede9f2d
OSDN Git Service
