OSDN Git Service
Adrian Roos [Wed, 19 Dec 2018 16:10:22 +0000 (17:10 +0100)]
apilint: Fix API lint issues
Fixes a bug where only the name instead of the fully qualified name was
considered when looking for a class, which lead to faulty results for inner
classes.
Test: python tools/apilint/apilint_test.py
Change-Id: Ib015669ed3faef21d2bdd16f1e27bc55c8669d70
Todd Kennedy [Fri, 14 Dec 2018 14:41:57 +0000 (14:41 +0000)]
Merge "Continue process boot even if 'idmap2 --scan' fails"
Abodunrinwa Toki [Fri, 14 Dec 2018 12:41:40 +0000 (12:41 +0000)]
Merge changes from topics "tcevent", "tc-ca-id"
* changes:
Introduce TextClassifierEvent
Add id to ConversationActions and conversationId to its Request
Dimitry Ivanov [Fri, 14 Dec 2018 11:09:28 +0000 (11:09 +0000)]
Merge "hwui: Add libGLESv3 to the list of shared_libs"
TreeHugger Robot [Fri, 14 Dec 2018 10:03:07 +0000 (10:03 +0000)]
Merge changes from topic "stream_combinations"
* changes:
Camera: Implement legacy device stream combination query
Camera: Add reprocessable mandatory stream combinations
Camera: Add support for mandatory stream combinations
Alan Stokes [Fri, 14 Dec 2018 09:43:19 +0000 (09:43 +0000)]
Merge "Apply a per-package limit to DCL data stored."
Abodunrinwa Toki [Tue, 11 Dec 2018 00:35:11 +0000 (00:35 +0000)]
Introduce TextClassifierEvent
This serves as a general TextClassifier event object for reporting
any textclassifier event and will replace the SelectionEvent class.
Example:
// Smart link clicked.
new TextClassifierEvent.Builder(CATEGORY_LINKIFY, TYPE_LINK_CLICKED)
.setEventContext(new TextClassificationContext.Builder(
pkgname, WIDGET_TYPE_TEXTVIEW)
.build())
.setEntityType(TextClassifier.EMAIL)
.setResultId(textclassification.getId())
.setEventIndex(0)
.setEventTime(now)
.setStart(0)
.setEnd(3)
.build();
Bug:
120837847
Test: See related cts CL
Test: atest cts/tests/tests/view/src/android/view/textclassifier/cts \
frameworks/base/core/tests/coretests/src/android/view/textclassifier
Change-Id: Ifd84a45fc5c46ffdb200dcb9600f6a470ce792bb
Tony Mak [Tue, 11 Dec 2018 11:38:53 +0000 (19:38 +0800)]
Add id to ConversationActions and conversationId to its Request
ID is used as session id when logging.
Conversation id is used for TextClassifier to keep track of ongoing
conversation.
BUG:
120803809
Test: atest TextClassifierTest.java
Test: atest ConversationActionsTest.java
Change-Id: Ifa2e25005efa9b16e480d9a06b376d726ea6d6d3
Luke Huang [Fri, 14 Dec 2018 06:38:47 +0000 (22:38 -0800)]
Merge "Covert list<String> into String[] in INetd" am:
d274332a9d am:
8fd6b59224
am:
b7f2831b3e
Change-Id: I17f7cac90c57f811cea87107ffd7f4472f25e79b
Luke Huang [Fri, 14 Dec 2018 06:23:42 +0000 (22:23 -0800)]
Merge "Covert list<String> into String[] in INetd" am:
d274332a9d
am:
8fd6b59224
Change-Id: Ia95981369d5840ad3b9489e47e0534dde49789ed
Luke Huang [Fri, 14 Dec 2018 06:11:56 +0000 (22:11 -0800)]
Merge "Covert list<String> into String[] in INetd"
am:
d274332a9d
Change-Id: I0e6cf058b441b542fcd49a94a0b4d08e417fe6bb
Luke Huang [Fri, 14 Dec 2018 05:57:34 +0000 (05:57 +0000)]
Merge "Covert list<String> into String[] in INetd"
Vishwath Mohan [Fri, 14 Dec 2018 03:38:20 +0000 (03:38 +0000)]
Merge "Extended Access mode for Trust Agents"
Aaron Huang [Fri, 14 Dec 2018 03:28:28 +0000 (19:28 -0800)]
Merge "apf: Drop ARP reply if SPA is 0.0.0.0" am:
b11a084ebc am:
2c02d789b7
am:
70badb2b3e
Change-Id: I7bb93495865286313e8052d44b54828fff82f244
Aaron Huang [Fri, 14 Dec 2018 03:19:12 +0000 (19:19 -0800)]
Merge "apf: Drop ARP reply if SPA is 0.0.0.0" am:
b11a084ebc
am:
2c02d789b7
Change-Id: I173fe764a1452066553f4376138a6ff768f7e3dd
Chen Xu [Fri, 14 Dec 2018 03:16:39 +0000 (19:16 -0800)]
[automerger skipped] Merge "move and rename DcFailCause to DataFailCause" am:
d2a163ad38 am:
49ebf0dfed
am:
f04d5a27d4 -s ours
Change-Id: I61be93082fd0603f28e043c5221ae08b5bb165cc
Aaron Huang [Fri, 14 Dec 2018 03:09:58 +0000 (19:09 -0800)]
Merge "apf: Drop ARP reply if SPA is 0.0.0.0"
am:
b11a084ebc
Change-Id: I5944f9c0afb62ced4595bf5c3c82e1b0e92a2199
Chen Xu [Fri, 14 Dec 2018 03:07:26 +0000 (19:07 -0800)]
Merge "move and rename DcFailCause to DataFailCause" am:
d2a163ad38
am:
49ebf0dfed
Change-Id: I725e3c5670428566373590b2c30603b0380fd3e9
Aaron Huang [Fri, 14 Dec 2018 03:00:21 +0000 (03:00 +0000)]
Merge "apf: Drop ARP reply if SPA is 0.0.0.0"
Chen Xu [Fri, 14 Dec 2018 02:58:06 +0000 (18:58 -0800)]
Merge "move and rename DcFailCause to DataFailCause"
am:
d2a163ad38
Change-Id: I2fbe4a974b1453fdb56b8cfdd53ebae56023f541
Inseob Kim [Fri, 14 Dec 2018 02:55:33 +0000 (18:55 -0800)]
[automerger skipped] Merge changes from topic "schematize_car_props" am:
b5278998c7 am:
e9f3d2e846
am:
a3febe8786 -s ours
Change-Id: I2b66af3afb98629cc36afa542add0ec03a26a4d2
Chen Xu [Fri, 14 Dec 2018 02:44:20 +0000 (02:44 +0000)]
Merge "move and rename DcFailCause to DataFailCause"
TreeHugger Robot [Fri, 14 Dec 2018 02:26:18 +0000 (02:26 +0000)]
Merge "Fix max height for settings_entity_header"
Inseob Kim [Fri, 14 Dec 2018 02:02:08 +0000 (18:02 -0800)]
Merge changes from topic "schematize_car_props" am:
b5278998c7
am:
e9f3d2e846
Change-Id: Ie302f69585892ea1465d9f4fce1b9699c8168f2c
Inseob Kim [Fri, 14 Dec 2018 01:51:30 +0000 (17:51 -0800)]
Merge changes from topic "schematize_car_props"
am:
b5278998c7
Change-Id: Iea4e7c25db3d3d95df70c2bbc242b3a35d7ff1c2
TreeHugger Robot [Fri, 14 Dec 2018 01:48:13 +0000 (01:48 +0000)]
Merge "Add performance test for suggestConversationActions and detectLanguage"
Treehugger Robot [Fri, 14 Dec 2018 01:31:29 +0000 (01:31 +0000)]
Merge changes from topic "schematize_car_props"
* changes:
Fix missing schematized Car system properties
Schematize Car system properties
Youming Ye [Fri, 14 Dec 2018 01:25:41 +0000 (17:25 -0800)]
Merge "Propagation of additional Ims Call Fail Causes" am:
97ee6295e9 am:
9834928c12
am:
c8dad0200a
Change-Id: Ia000a059426943a03898416b54168778e64b6597
Inseob Kim [Fri, 14 Dec 2018 01:13:27 +0000 (17:13 -0800)]
[automerger skipped] Schematize vold system properties am:
0a91222c83
am:
ccc7473fb5 -s ours
Change-Id: Iac5ce5ff798fc6ed9dbfce74b9ce080fcbaf19b8
TreeHugger Robot [Fri, 14 Dec 2018 01:05:28 +0000 (01:05 +0000)]
Merge "Remove unneccessary locking"
Vishnu Nair [Fri, 14 Dec 2018 01:04:53 +0000 (01:04 +0000)]
Merge "Pip: Use raw input coordiates when calculating pip movement offsets"
Jeff Sharkey [Fri, 14 Dec 2018 01:00:16 +0000 (01:00 +0000)]
Merge "Simple mask of incoming file mode."
Jeff Sharkey [Fri, 14 Dec 2018 01:00:10 +0000 (01:00 +0000)]
Merge "Validate incoming authority values."
Sahin Caliskan [Fri, 14 Dec 2018 00:44:27 +0000 (16:44 -0800)]
[automerger skipped] Merge "Move RCS APIs to android.telephony.ims" am:
4929a0d782 am:
7c7dc29e8d
am:
02278c9c53 -s ours
Change-Id: Ia13cf9c8ab55340c1013338f8054bc55c223e005
Nan Zhang [Fri, 14 Dec 2018 00:37:08 +0000 (16:37 -0800)]
Merge "Add back doc-comment-check-docs back to checkbuild." am:
cb61d10c90 am:
8ca3397939
am:
bef1543221
Change-Id: I227e7e6abc414cecbe827afcc6f53e5fa0c68b26
Elliott Hughes [Fri, 14 Dec 2018 00:29:17 +0000 (16:29 -0800)]
Merge "No-one should need libunwind in 2018..." am:
36c37f3ceb am:
631c98599d
am:
4dd189efe3
Change-Id: I57eb5f724df10b5400cb6d0aa89cf83da5022eb8
Youming Ye [Fri, 14 Dec 2018 00:24:50 +0000 (16:24 -0800)]
Merge "Propagation of additional Ims Call Fail Causes" am:
97ee6295e9
am:
9834928c12
Change-Id: Ie3d7b237e3d7cfe2c53498807ff18bdbbfae61e9
TreeHugger Robot [Fri, 14 Dec 2018 00:24:50 +0000 (00:24 +0000)]
Merge "Lowered the edge swipe threshold for better detection"
Youming Ye [Fri, 14 Dec 2018 00:14:57 +0000 (16:14 -0800)]
Merge "Propagation of additional Ims Call Fail Causes"
am:
97ee6295e9
Change-Id: I793444071637613cf5d381c0dab179ddd8f47fa2
Inseob Kim [Fri, 14 Dec 2018 00:14:18 +0000 (16:14 -0800)]
Schematize vold system properties
am:
0a91222c83
Change-Id: I3462d493bf88d7a435573659af9d8fa2062723b0
TreeHugger Robot [Fri, 14 Dec 2018 00:10:49 +0000 (00:10 +0000)]
Merge "BatteryStats: NETWORK_TYPE_NR support"
Philip P. Moltmann [Thu, 13 Dec 2018 23:55:50 +0000 (15:55 -0800)]
Merge "Add me to privapp-permissions owner file" am:
657d612206 am:
99eed50991
am:
db21099c1c
Change-Id: I6d5e4fc9eb450243896cf43a4215810cc34d2cde
Youming Ye [Thu, 13 Dec 2018 23:47:49 +0000 (23:47 +0000)]
Merge "Propagation of additional Ims Call Fail Causes"
Shuo Qian [Thu, 13 Dec 2018 23:42:14 +0000 (23:42 +0000)]
Merge "Add Emergency Dial into RIL and Remove PhoneNumberUtils Ecclist check"
TreeHugger Robot [Thu, 13 Dec 2018 23:36:32 +0000 (23:36 +0000)]
Merge "Grant removed install permissions"
Inseob Kim [Thu, 8 Nov 2018 04:13:54 +0000 (13:13 +0900)]
Schematize vold system properties
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.
Bug:
117924132
Test: m -j
Change-Id: I8e04f643197b6c8a60cc38c6979e41c5de3469f5
Merged-In: Iedfd3c1dda665006ea5410ee787c3ca447ac7db1
(cherry picked from commit
c1246e6c364bbfef18d566f6b16f46ca1a5216c5)
Mark Chien [Thu, 13 Dec 2018 23:35:04 +0000 (15:35 -0800)]
Merge "Track default upstream when system is ready" am:
d9eeba6fd1 am:
8e4f9929e7
am:
25e0a60024
Change-Id: I72c041051f3bd1735a438f8ce7ded83cf26136f9
Sahin Caliskan [Thu, 13 Dec 2018 23:29:00 +0000 (15:29 -0800)]
Merge "Move RCS APIs to android.telephony.ims" am:
4929a0d782
am:
7c7dc29e8d
Change-Id: I2301681cd38c2d364c9e3a5bf94adb400065418c
TreeHugger Robot [Thu, 13 Dec 2018 23:27:39 +0000 (23:27 +0000)]
Merge "AM: Report launch state with activity launch info"
Adrian Roos [Thu, 13 Dec 2018 23:25:59 +0000 (15:25 -0800)]
Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi (2/2)" am:
a48e431113 am:
a11f1d2d50
am:
84f03da369
Change-Id: I4c746b570470301f076efca9d4897cb2032a3732
Zach Johnson [Thu, 13 Dec 2018 23:05:09 +0000 (15:05 -0800)]
Merge "Pass package name as part of startDiscovery" am:
bee9a87193 am:
683e379471
am:
ff44d968eb
Change-Id: I6bfc7638d6f4e3487ece2452743c68150aaaf754
Nan Zhang [Thu, 13 Dec 2018 23:02:00 +0000 (15:02 -0800)]
Merge "Add back doc-comment-check-docs back to checkbuild." am:
cb61d10c90
am:
8ca3397939
Change-Id: I6cf5079067dceac0a994cc0378bde7b1e72eb268
Elliott Hughes [Thu, 13 Dec 2018 22:55:45 +0000 (14:55 -0800)]
Merge "No-one should need libunwind in 2018..." am:
36c37f3ceb
am:
631c98599d
Change-Id: I974d0f8fb20b65a71926094d16c165f1b05b8d95
MÃ¥rten Kongstad [Wed, 12 Dec 2018 11:57:50 +0000 (12:57 +0100)]
Continue process boot even if 'idmap2 --scan' fails
Relax the requirement on 'idmap2 --scan' to exit normally (as defined by
WIFEXITED) when starting a process. This allows the process to continue
booting, but with the caveat that no static="true" overlays targeting
"android" will be loaded.
The booting process is usually Zygote but can be an app that uses a
wrap.sh script (see https://d.android.com/ndk/guides/wrap-script).
Because SELinux rules prevent most processes from executing
/system/bin/idmap2, 'idmap2 --scan' will fail for "wrapped" apps.
Bug:
120854885
Test: atest CtsWrapWrapDebugTestCases CtsWrapWrapDebugMallocDebugTestCases
Change-Id: I85225cbcdd945f0026879e89f481d733217825d5
Youming Ye [Thu, 13 Dec 2018 22:53:18 +0000 (14:53 -0800)]
Merge "Fix property setting with failure" am:
da9de2d7fa am:
58be59a233
am:
bab83ccabb
Change-Id: I7729325710e1b4b9d4fa08e719aba6021acb90d3
Philip P. Moltmann [Thu, 13 Dec 2018 22:49:19 +0000 (14:49 -0800)]
Merge "Add me to privapp-permissions owner file" am:
657d612206
am:
99eed50991
Change-Id: I489dee2ef3de912de860bf3f0e2f3aaec5277862
Sahin Caliskan [Thu, 13 Dec 2018 22:48:15 +0000 (14:48 -0800)]
Merge "Move RCS APIs to android.telephony.ims"
am:
4929a0d782
Change-Id: Ida83ad0354730825ed46dfe2011d2c3ee976c95a
TreeHugger Robot [Thu, 13 Dec 2018 22:45:20 +0000 (22:45 +0000)]
Merge "Update SystemUI to use headline/body fonts (1/N)"
Mark Chien [Thu, 13 Dec 2018 22:42:04 +0000 (14:42 -0800)]
Merge "Track default upstream when system is ready" am:
d9eeba6fd1
am:
8e4f9929e7
Change-Id: I36d2eb778603ea68cca43bfe9103b25ab8bb4d37
Eric Laurent [Thu, 13 Dec 2018 22:36:26 +0000 (22:36 +0000)]
Merge "AudioEffect: make effect descriptor parcelable"
Adrian Roos [Thu, 13 Dec 2018 22:33:46 +0000 (14:33 -0800)]
Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi (2/2)" am:
a48e431113
am:
a11f1d2d50
Change-Id: I726f41142ead73b0a579b01ea477df63e74673e5
Nan Zhang [Thu, 13 Dec 2018 22:23:43 +0000 (14:23 -0800)]
Merge "Add back doc-comment-check-docs back to checkbuild."
am:
cb61d10c90
Change-Id: Ic837d63293d6cf80c8b03424743493cb29a92f73
Jeff Sharkey [Thu, 13 Dec 2018 22:21:41 +0000 (22:21 +0000)]
Merge "API Lint: Add support for base current.txt"
Xin Li [Thu, 13 Dec 2018 22:19:37 +0000 (14:19 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am:
a32f898720 -s ours am:
16985b8bf2 -s ours
am:
0c0f42ff16 -s ours
Change-Id: I10c1e303d19836aaaa2d5991925fe8a93fbc0791
Elliott Hughes [Thu, 13 Dec 2018 22:18:32 +0000 (14:18 -0800)]
Merge "No-one should need libunwind in 2018..."
am:
36c37f3ceb
Change-Id: I36064f4675a785c6a9a228af79eed51071fe4205
Fabian Kozynski [Thu, 13 Dec 2018 22:15:31 +0000 (22:15 +0000)]
Merge "Set initial color in bg Drawable as TRANSPARENT"
Philip P. Moltmann [Thu, 13 Dec 2018 22:13:35 +0000 (14:13 -0800)]
Merge "Add me to privapp-permissions owner file"
am:
657d612206
Change-Id: I4203ff07eb63ccd8797e78217cbefe6d3d10b28a
Android Build Merger (Role) [Thu, 13 Dec 2018 22:08:02 +0000 (22:08 +0000)]
Merge "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am:
15b123ef45 -s ours am:
b95e69c196 -s ours am:
9b6fe73a72 -s ours"
Zach Johnson [Thu, 13 Dec 2018 22:07:36 +0000 (14:07 -0800)]
Merge "Pass package name as part of startDiscovery" am:
bee9a87193
am:
683e379471
Change-Id: I8dee413204c52bd715403d13696939930220cb10
Mark Chien [Thu, 13 Dec 2018 22:07:28 +0000 (14:07 -0800)]
Merge "Track default upstream when system is ready"
am:
d9eeba6fd1
Change-Id: I7febc52d94c1249b76608853d5cc142cdb8ad9df
Jeff Sharkey [Thu, 13 Dec 2018 22:06:05 +0000 (15:06 -0700)]
Validate incoming authority values.
A single provider may offer multiple authorities, so we now pass along
the authority being requested. However, we need to validate that the
authority is actually serviced by the provider, similar to what we do
in validateIncomingUri().
Bug:
120673301
Test: atest android.content.cts
Test: atest android.provider.cts
Change-Id: Ia9734a42558ee9d46dc54f7e12b596cf03a520f5
Adrian Roos [Thu, 13 Dec 2018 22:01:45 +0000 (14:01 -0800)]
Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi (2/2)"
am:
a48e431113
Change-Id: I4f5284ab3445e89a2394386ca0da6ae8cf613906
Jeff Sharkey [Thu, 13 Dec 2018 22:01:38 +0000 (15:01 -0700)]
Simple mask of incoming file mode.
Oops, we need to support MODE_WRITE_ONLY.
Bug:
120914823
Test: atest android.os.storage.cts.StorageManagerTest
Change-Id: I9a55656562c9a2c0c2073234fc272a4da24e2a0f
Adrian Roos [Thu, 13 Dec 2018 21:57:23 +0000 (21:57 +0000)]
Merge "AppErrors: Remove ANR broadcast"
Matthew Ng [Thu, 13 Dec 2018 21:43:46 +0000 (13:43 -0800)]
Lowered the edge swipe threshold for better detection
Test: manual
Bug:
112934365
Change-Id: If3b586631d97599c5c6e38836ffdad17e81730f1
Xin Li [Thu, 13 Dec 2018 21:54:36 +0000 (13:54 -0800)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am:
15b123ef45 -s ours am:
b95e69c196 -s ours
am:
9b6fe73a72 -s ours
Change-Id: I998a4f2c8509815cf75e0b03e51831b325fbbea5
Youming Ye [Thu, 13 Dec 2018 21:53:07 +0000 (13:53 -0800)]
Merge "Fix property setting with failure" am:
da9de2d7fa
am:
58be59a233
Change-Id: Ia3994b3595d6ccd945dc9ca45f7fc4c46c12908a
Zach Johnson [Thu, 13 Dec 2018 21:49:20 +0000 (13:49 -0800)]
Merge "Pass package name as part of startDiscovery"
am:
bee9a87193
Change-Id: I30eb9a65e4854eff1539d6d86d3f932675eb2dc2
Selim Cinek [Thu, 13 Dec 2018 21:47:08 +0000 (21:47 +0000)]
Merge "Fixed an issue where the darkmode wasn't applied to all views"
TreeHugger Robot [Thu, 13 Dec 2018 21:45:33 +0000 (21:45 +0000)]
Merge "cherry-pick from pi-dev docs: Fixing malformed javadoc"
TreeHugger Robot [Thu, 13 Dec 2018 21:44:25 +0000 (21:44 +0000)]
Merge "Add page id for financial apps sms access."
TreeHugger Robot [Thu, 13 Dec 2018 21:44:18 +0000 (21:44 +0000)]
Merge "Clearing QuotaController data on app/user removal."
Youming Ye [Thu, 13 Dec 2018 21:40:11 +0000 (13:40 -0800)]
Merge "Fix property setting with failure"
am:
da9de2d7fa
Change-Id: I7d8dc7d114a6381417a54310793ea0bae5881e99
Adrian Roos [Thu, 13 Dec 2018 21:08:29 +0000 (22:08 +0100)]
API Lint: Add support for base current.txt
Allows specifying a base current.txt and previous.txt file when linting
system-current.txt and test-current.txt to avoid false positive error
messages due to public API members not being duplicated in the respective
non-public APIs
Test: python tools/apilint/apilint.py --base-current=api/current.txt api/system-current.txt
Change-Id: I306a99b1423584ef3fcdc9272a83cb5eacc37227
TreeHugger Robot [Thu, 13 Dec 2018 21:15:11 +0000 (21:15 +0000)]
Merge "Allow statsd_testdrive to work in root"
Jeff Sharkey [Thu, 13 Dec 2018 21:11:42 +0000 (21:11 +0000)]
Merge "Legacy storage behavior for pre-isolated apps."
Jeff Sharkey [Thu, 13 Dec 2018 21:04:14 +0000 (21:04 +0000)]
Merge "This is a giant mess."
Nader Jawad [Thu, 13 Dec 2018 21:02:37 +0000 (21:02 +0000)]
Merge "Added support for additional Blend Modes"
Xin Li [Thu, 13 Dec 2018 21:01:05 +0000 (13:01 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am:
a32f898720 -s ours
am:
16985b8bf2 -s ours
Change-Id: I4988e15e6b919c6d237706dc578631c1cf9cc1fa
TreeHugger Robot [Thu, 13 Dec 2018 20:57:34 +0000 (20:57 +0000)]
Merge "Set importantForAccessibility NO on QSDetail"
chen xu [Thu, 13 Dec 2018 06:17:51 +0000 (22:17 -0800)]
move and rename DcFailCause to DataFailCause
Bug:
119891533
Test: Build
Change-Id: I6f0e474a9ee3f8befc8b0a221713a2080b59844c
Merged-in: I6f0e474a9ee3f8befc8b0a221713a2080b59844c
Sahin Caliskan [Thu, 13 Dec 2018 20:48:34 +0000 (20:48 +0000)]
Merge "Move RCS APIs to android.telephony.ims"
Xin Li [Thu, 13 Dec 2018 20:47:28 +0000 (12:47 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
am:
a32f898720 -s ours
Change-Id: I7710a0b1a5ba1bf7acd45d694818aec91853e546
Amin Shaikh [Thu, 13 Dec 2018 20:12:14 +0000 (15:12 -0500)]
Update SystemUI to use headline/body fonts (1/N)
First pass simply replacing sans-serif with config_bodyFontFamily in
SystemUI styles.
Bug:
120988129
Test: manual using HotDogOverlay
Change-Id: Iefc87d77ed0b336357441e7464e540a1a99eb449
Rafal Slawik [Thu, 13 Dec 2018 20:31:32 +0000 (20:31 +0000)]
Merge "Update documentation for memory atoms."
Dianne Hackborn [Thu, 13 Dec 2018 20:27:33 +0000 (20:27 +0000)]
Merge "Add facility to limit associations that are allowed between apps."
Xin Li [Thu, 13 Dec 2018 20:16:11 +0000 (12:16 -0800)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am:
15b123ef45 -s ours
am:
b95e69c196 -s ours
Change-Id: Icf77675866d843c8d6d5cc30ea1a5f1d8f0cfba7
Adrian Roos [Thu, 13 Dec 2018 20:14:27 +0000 (12:14 -0800)]
[automerger skipped] FRP: save password quality in DPM.resetPassword am:
ef116def7c -s ours am:
b6fb68f7fd -s ours
am:
5561b1bc27 -s ours
Change-Id: Ifc9c36d2a91f59c2cedd8e140a811a98ce2a8a7a
Fabian Kozynski [Thu, 13 Dec 2018 20:05:31 +0000 (15:05 -0500)]
Set initial color in bg Drawable as TRANSPARENT
If the color is not set, the tiles appear as black before they are
properly drawn and tinted. This is visible when switching from secondary
user to Owner
Test: Visual
Change-Id: I5d2801484b036ef2dd22153672519911fceaa3c3
Fixes:
120883348
Adrian Roos [Thu, 13 Dec 2018 19:50:25 +0000 (11:50 -0800)]
[automerger skipped] FRP: save password quality in DPM.resetPassword am:
ef116def7c -s ours
am:
b6fb68f7fd -s ours
Change-Id: I3e8eba4defa5a0d0405730efad330d113ec8195c