Commit Graph

390131 Commits

Author SHA1 Message Date
WyattRiley
bc5a8b0241 Demote missing XTRA iface from Error to Info
On boot, partner use of XTRA interface is optional,
demoting severity of log message.

Bug: 64816395
Test: Device boots with only Info level message
Change-Id: Ib99ab74192ea588a1440301f7d5ddbc0c8c4d9dc
2018-10-31 13:06:34 -07:00
Android Build Merger (Role)
ed0f12628d Merge "Merge "Clarify createScaledBitmap's 'filter' docs" am: e0f6d84ba1 am: 324cb8c075 am: c2eaf48e42" 2018-10-26 01:17:57 +00:00
John Reck
c59e7dd6ad Merge "Clarify createScaledBitmap's 'filter' docs" am: e0f6d84ba1 am: 324cb8c075
am: c2eaf48e42

Change-Id: Id0a228f273f83b238ba1df92a78b7a0da66c4209
2018-10-25 18:17:28 -07:00
Android Build Merger (Role)
d76ab2f421 Merge "Merge "Move startop/tools/view_compiler to startop/view_compiler" am: af22f56863 am: d99adc0e45 am: 4c8a976a0e" 2018-10-26 01:11:37 +00:00
Eric Holk
be452b24b5 Merge "Move startop/tools/view_compiler to startop/view_compiler" am: af22f56863 am: d99adc0e45
am: 4c8a976a0e

Change-Id: I09a8bcd5a4bc6420bb1b71ca27c0197b1d8aa5fd
2018-10-25 18:11:12 -07:00
Android Build Merger (Role)
63640c87eb Merge "Merge "Add @Nullable for getSubscriptionIds" am: ceceb459e0 am: 6d46d98598 am: 1b023cfa7c" 2018-10-26 01:05:03 +00:00
sqian
36d6e75155 Merge "Add @Nullable for getSubscriptionIds" am: ceceb459e0 am: 6d46d98598
am: 1b023cfa7c

Change-Id: Iaecc9ed426b7649e1b5009e7c78397a8ffe16563
2018-10-25 18:04:39 -07:00
Android Build Merger (Role)
f4b1dba764 Merge "Merge "Allow implicit-fallthrough warnings locally." am: 36afe11a64 am: 9c5738238d am: 469705cca4" 2018-10-26 00:58:44 +00:00
Chih-hung Hsieh
51025d638d Merge "Allow implicit-fallthrough warnings locally." am: 36afe11a64 am: 9c5738238d
am: 469705cca4

Change-Id: I4bc5f389495ed535762438632e65ccd6c66f3739
2018-10-25 17:58:17 -07:00
TreeHugger Robot
60515d1d39 Merge "Enable smart dark" 2018-10-26 00:57:59 +00:00
Hans Boehm
c18cd05c6f Merge "Remove NotificationVisibility storage pool" am: 24141e8124 am: cd2a7fb3b6
am: 8e96fe2c7f

Change-Id: I48d179b2e44b55541a5fe7b89d2daa1f7eeb5dd4
2018-10-25 17:51:50 -07:00
Eric Laurent
57e396c571 Merge "Fixed unsafe lock upon safe media volume" am: cbcaabedfd am: 61d553f224
am: 8611300f37

Change-Id: Iea59bc11783302b0404a8434d3a18e82a0bd0bac
2018-10-25 17:45:35 -07:00
Chen Xu
e4e589163b Merge "NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType" am: 6730f34590 am: 23e8eadca9
am: 8da63cc369

Change-Id: I2a21387c6740eff5ef08ea14abbf484be25b8928
2018-10-25 17:39:14 -07:00
Chen Xu
1dd69f1924 Merge "Need to check empty not null for String" am: e09f7b5ebb am: 99053e471d
am: 97ddb61829

Change-Id: I2b3ba7b8f1d4198120b48693e9c4fc7e7e35d0ab
2018-10-25 17:32:51 -07:00
Chen Xu
42f00a23e2 [automerger skipped] Merge changes from topic "carrier_id_aosp_cp" am: fccdf46adf am: 8463ad7760
am: db45db791a  -s ours

Change-Id: I044825b3a1b72e86e1cb1e4336b9e19eafd7b333
2018-10-25 17:22:34 -07:00
Paul Duffin
6db9e580a2 [automerger skipped] Merge "Remove more libcore classes from light grey/vendor lists" am: bb58511bcb am: 00b65127e2
am: 2b84af299e  -s ours

Change-Id: Ie6d3372aac5df784436df083156f6f0ddc9ea975
2018-10-25 17:13:53 -07:00
Android Build Merger (Role)
59de15988d Merge "Merge "Reduce excess local prefix computations" am: 35d9291ca7 am: 069fd8e996 am: 7b86429051" 2018-10-25 23:58:47 +00:00
markchien
7018cc1e8b Merge "Reduce excess local prefix computations" am: 35d9291ca7 am: 069fd8e996
am: 7b86429051

Change-Id: I9f196b866e8518c9fa0dd22ee5e2a7725130361d
2018-10-25 16:58:22 -07:00
TreeHugger Robot
1cfaeed73b Merge "Log uid info to KeyValuePairAtom" 2018-10-25 23:57:34 +00:00
TreeHugger Robot
f2e324bcdb Merge "Fix local Binder call scenario of IMMS#addClient()" 2018-10-25 23:53:20 +00:00
Android Build Merger (Role)
f30d8a90d6 Merge "Merge "pm: Disallow HIDL libs from boot jars >= Q." am: 06182b0764 am: 7430f3e6fd am: 71ac2676b6" 2018-10-25 23:52:15 +00:00
Steven Moreland
748f697207 Merge "pm: Disallow HIDL libs from boot jars >= Q." am: 06182b0764 am: 7430f3e6fd
am: 71ac2676b6

Change-Id: I4daf19b65d9b3e24c196e6ede697935b5c5460a3
2018-10-25 16:51:48 -07:00
Android Build Merger (Role)
329e94131f Merge "Merge "Remove explicit dependencies on core library" am: 03c766075d am: 22f561340d am: 08ecb4954a" 2018-10-25 23:45:53 +00:00
Neil Fuller
e064262ad6 Merge "Remove explicit dependencies on core library" am: 03c766075d am: 22f561340d
am: 08ecb4954a

Change-Id: Id14accc8966a3fb7c2986dccbe067da8733123b0
2018-10-25 16:45:26 -07:00
Amit Mahajan
1e774558c5 Merge "Adding new intent ACTION_SMS_MMS_DB_CREATED." 2018-10-25 23:44:50 +00:00
Android Build Merger (Role)
33dd7512ca Merge "Merge "Fix FD leak during ADB shell install." am: c558f4cedf am: 9882ad7a27 am: 139124cd77" 2018-10-25 23:39:40 +00:00
Chuanghua Zhao
3a9756c205 Merge "Fix FD leak during ADB shell install." am: c558f4cedf am: 9882ad7a27
am: 139124cd77

Change-Id: I9742eadf7e7de255c73bce7a8246a6e5247526ca
2018-10-25 16:38:53 -07:00
Android Build Merger (Role)
12edaafefc Merge "[automerger skipped] Merge "Fix implicit-fallthrough warnings. DO NOT MERGE." am: 46049f5fec -s ours am: fb5b05d2ff -s ours am: b7ce376383 -s ours" 2018-10-25 23:32:58 +00:00
Chih-Hung Hsieh
76efb2b691 [automerger skipped] Merge "Fix implicit-fallthrough warnings. DO NOT MERGE." am: 46049f5fec -s ours am: fb5b05d2ff -s ours
am: b7ce376383  -s ours

Change-Id: Ic6dda848431242e4238dd97cd42512d2a18d3741
2018-10-25 16:32:24 -07:00
Android Build Merger (Role)
a4348888f8 Merge "Merge "Allow implicit-fallthrough warnings locally." am: dd68cf76de am: 0db2c27df7 am: eb919bc560" 2018-10-25 23:32:19 +00:00
Chih-hung Hsieh
24df0f9051 Merge "Allow implicit-fallthrough warnings locally." am: dd68cf76de am: 0db2c27df7
am: eb919bc560

Change-Id: If05d93a4eea5b0330585bd7e3b64a68d2006e84c
2018-10-25 16:31:55 -07:00
Android Build Merger (Role)
618538adcf Merge "Merge "Fix implicit-fallthrough warnings." am: 8f520e6f83 am: a6c90c99cd am: bd0093e182" 2018-10-25 23:25:58 +00:00
Chih-Hung Hsieh
78cb9b14cf Merge "Fix implicit-fallthrough warnings." am: 8f520e6f83 am: a6c90c99cd
am: bd0093e182

Change-Id: Idfda76fbd502f84ac7abb9315d6fff9e923fdefd
2018-10-25 16:25:20 -07:00
Matthew Ng
a3501ed0e4 Merge "Experiment to be able to change the navigation bar thickness (1/2)" 2018-10-25 23:17:46 +00:00
Dan Shi
420c35784b Merge "resolve merge conflicts of 3084f41930 to master" 2018-10-25 23:08:50 +00:00
Jovana Knezevic
840d565542 Merge "Adds automatic switching to Guest if user starts driving with the keyguard up." 2018-10-25 22:52:28 +00:00
John Reck
5711911bd3 Enable smart dark
Bug: 116860870
Test: builds, smart dark applies for targetSdk >= Q && night mode is
enabled
Change-Id: I66e4ec4ad3e5c886c5260137fd48e2c92ee59552
2018-10-25 15:25:51 -07:00
TreeHugger Robot
bef47d02d5 Merge "DataSourceDesc: set max time in ms and us" 2018-10-25 22:11:19 +00:00
TreeHugger Robot
93399bedce Merge "Null check on NavigationBarView in NavigationBarFragment" 2018-10-25 21:43:54 +00:00
TreeHugger Robot
148eba158c Merge "Use raw MotionEvent coordinates when tracking velocity" 2018-10-25 20:52:36 +00:00
Howard Ro
1a2a399419 Log uid info to KeyValuePairAtom
Bug: 118153464
Test: verified the data via print-logs in logcat
Change-Id: I74fcde1a7d2b2c37eb6d63e40fb5cb40ebb9cff9
2018-10-25 13:26:42 -07:00
Dan Shi
059d6d7016 resolve merge conflicts of 3084f41930 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie8de98c824fc07b35c50585359a6b9c32eea18e5
2018-10-25 13:13:57 -07:00
Jeff Sharkey
ac1973164c Merge "We wanted actual protection level, not flags." 2018-10-25 20:12:20 +00:00
Amit Mahajan
8c1c45a710 Adding new intent ACTION_SMS_MMS_DB_CREATED.
Test: manual (verified from logcat that intent is broadcast)
Bug: 115990430
Change-Id: I660cf2d04a1b57a58c8cefd212e5f8d73b329890
2018-10-25 13:00:36 -07:00
Lucas Dupin
e5a33306a5 Merge "Animate backspace when unlocking" 2018-10-25 19:59:07 +00:00
TreeHugger Robot
f7082520bf Merge "Factor out InputMethodManager#forContext()" 2018-10-25 19:39:41 +00:00
Marco Nelissen
6baf5e4e1c Merge "Don't try to compress opus resources" 2018-10-25 19:39:11 +00:00
TreeHugger Robot
f456997a8a Merge "Make pattern animation a little faster" 2018-10-25 19:35:22 +00:00
TreeHugger Robot
03b8c0f49c Merge "Allow atoms to log fields in bytes format." 2018-10-25 19:04:17 +00:00
Wei Jia
f4d209cd36 DataSourceDesc: set max time in ms and us
Test: cts
Bug: 112549021
Change-Id: I1ff062a26be896c62500457da18ce3b5a869765a
2018-10-25 11:41:09 -07:00