Chen Xu
42f00a23e2
[automerger skipped] Merge changes from topic "carrier_id_aosp_cp" am: fccdf46adf am: 8463ad7760
...
am: db45db791a
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
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
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
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
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
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
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
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
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
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
Bill Yi
e8b53b2d54
Merge "Merge pi-dr1-dev to aosp-master" am: 04d53e2611 am: 6bf05d4c6f
...
am: f5e484a688
2018-10-25 11:25:08 -07:00
Matthew Ng
605ea47490
Experiment to be able to change the navigation bar thickness (1/2)
...
Use resource overlays to change the 2 dimension navigation_bar_height
and navigation_bar_frame_height to specify how large the navigation bar
is and how large its buttons are (also for width). There are two
overlays: first to slim the navigation bar to 75% and the other to have
floating navigation buttons.
go/navbar-experiments-doc
Test: manual
Bug: 113952590
Change-Id: I936c9fa49ba029b4174a22b7e35ee070a9e07e4b
2018-10-25 11:18:02 -07:00
Evan Laird
b8b717f795
Null check on NavigationBarView in NavigationBarFragment
...
While sysui is starting, it's possible to get disable callbacks before
the NavigationBarView has had a chance to get created. In this case just
don't pass the message, similar to Disable1 callbacks
Change-Id: Ic89ca281579ff9720c356f79102d1b576670740a
Fixes: 118357487
Test: no exceptions during system boot after wiping
2018-10-25 14:08:32 -04:00
Alison Cichowlas
1943b6f856
Merge "Suppress flaky test"
2018-10-25 17:59:41 +00:00
Makoto Onuki
25c782f9f2
Merge "DB Wipe detection"
2018-10-25 17:40:43 +00:00
Jeff Sharkey
da3b55a122
Merge "Reroute Uri conversions though MediaProvider."
2018-10-25 16:57:59 +00:00
Jean-Michel Trivi
4ea7d34d13
Merge "AudioTrack: fix javadoc"
2018-10-25 16:37:17 +00:00
Lucas Dupin
33b4c28c32
Animate backspace when unlocking
...
Bug: 111405682
Fixes: 118414397
Test: visual
Change-Id: Ie5af400e9869558832939debdb61190d6d32f3d7
2018-10-25 16:37:04 +00:00
John Reck
fcf14cfd94
Merge "Add theme & View API to control force-dark"
2018-10-25 16:35:10 +00:00
Jean-Michel Trivi
8d32c45729
AudioTrack: fix javadoc
...
Bug: N/A
Test: make offline-sdk-docs
Change-Id: Ie2ebeddc477d5bd083280cfb91bd8c82e7047fb4
2018-10-25 09:30:37 -07:00
Jeff Sharkey
9d4654c03a
We wanted actual protection level, not flags.
...
Bug: 118083154
Test: manual
Change-Id: Ib5b105add2b92401f2dc4a3ca676d3303b46d54f
2018-10-25 09:58:59 -06:00
Marco Nelissen
18f16d6241
Don't try to compress opus resources
...
Test: build
Change-Id: Ibf398b3afca02d4111d88b126c8d107ac44068a6
2018-10-25 08:31:19 -07:00
Alison Cichowlas
29c64fb096
Suppress flaky test
...
Test: This is it
Bug: 118400112
Change-Id: I60be79618f4fd5b22438d47f1b8ce0756d486dee
2018-10-25 11:27:15 -04:00
TreeHugger Robot
1d63e024de
Merge changes Ic6b623a7,Ib6811066
...
* changes:
Makes minor modifications to Intent-based Service APIs
Adds AIDL definitions for register/unregisterIntent
2018-10-25 15:14:17 +00:00
Makoto Onuki
8d71ec09b7
Merge "Sync log on IO thread"
2018-10-25 15:03:23 +00:00
