Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
399,405 Commits 3 Branches 0 Tags
7dcdca64e8e08050fa282e6c4ae3341389fbf6fc
Commit Graph

399405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shubang Lu
7dcdca64e8 Merge changes I9d4649ee,I454a6d22,Icaf172a5,Ib21162d7,I120801fd 
* changes:
  Fix crash on TV device from casting error.
  When device reboots, it should not go to real standby.
  Use : hex format for HdmiCecMessage.toString
  Improve CEC logging
  Complete the HDMI_SYSTEM_AUDIO_CONTROL_ENABLED control logic in Audio System device.
 2019-01-16 01:49:35 +00:00
Xiangyu/Malcolm Chen
d706a9df5e Merge "Don't show signal bar of hidden Cellular subscription." 2019-01-16 01:42:10 +00:00
Shubang Lu
a6c9e20c26 Merge changes I97f97167,I4bf51c47,I8d3193e0,I224a1616,Ie774b0eb, ... 
* changes:
  Adding HDMI_CEC_SWITCH_ENABLE Global property to enable/disable Routing Control feature.
  Fix spelling errors in HdmiCecMessage.toString
  More skeleton code for <RequestShortAuidoDescriptor>
  Add a getPhysicalAddress api to hdmicontrolservice.
  Set System Audio Mode on when switch to Audio Only source
  Call HdmiCecLocalDeviceAudioSystem to report audio status.
  Add a delay state into DeviceDiscoveryAction.
 2019-01-16 01:40:24 +00:00
Xiangyu/Malcolm Chen
947a92c2ff [automerger skipped] Merge "Make setMetered and setOpportunistic public." am: 609ed3380f am: dfbb25679f 
am: 6eb5fa9219 -s ours
am skip reason: change_id Id6f074b15a1c03d00ede2665d44595fa7be965e4 with SHA1 7e22ba6160 is in history

Change-Id: I63206b178303e8f166807df762e3c1cca7d13e8f
 2019-01-15 17:36:11 -08:00
TreeHugger Robot
74fe901315 Merge "Disallow pinned stack to control occluded state." 2019-01-16 01:26:07 +00:00
TreeHugger Robot
3ee68ec453 Merge "MediaPlayer2: fix checking for next datasources" 2019-01-16 01:23:32 +00:00
Android Build Merger (Role)
48eb9e0d46 Merge "[automerger skipped] resolve merge conflicts of 17c69f5414 to pi-dev-plus-aosp am: 4b2604d3d1 -s ours am skip reason: change_id I4d7a203dd57050535867329c8dc36f8c75667c15 with SHA1 c50a1ef795 is in history" 2019-01-16 01:21:33 +00:00
TreeHugger Robot
34495b9fc8 Merge "VkFunctorDrawable implementation" 2019-01-16 01:21:08 +00:00
Brad Ebinger
6b01208ead [automerger skipped] resolve merge conflicts of 17c69f5414 to pi-dev-plus-aosp 
am: 4b2604d3d1 -s ours
am skip reason: change_id I4d7a203dd57050535867329c8dc36f8c75667c15 with SHA1 c50a1ef795 is in history

Change-Id: Ib85ce1c7d1b6272ecd461aa8a9dc9f3bc306c4f3
 2019-01-15 17:20:13 -08:00
Xiangyu/Malcolm Chen
6eb5fa9219 Merge "Make setMetered and setOpportunistic public." am: 609ed3380f 
am: dfbb25679f

Change-Id: I25c0c4f0a5d1677934b64fc377c2289476abcd01
 2019-01-15 17:17:51 -08:00
Aurimas Liutikas
3b2c2b7792 Merge "Rerun update-api. It was out of sync." 2019-01-16 00:40:42 +00:00
TreeHugger Robot
ebf16b139e Merge "Fix nondeterminism in LMS" 2019-01-16 00:29:41 +00:00
Xiangyu/Malcolm Chen
dfbb25679f Merge "Make setMetered and setOpportunistic public." 
am: 609ed3380f

Change-Id: I54643465606667343a98bb9871084a2514951a93
 2019-01-15 16:16:10 -08:00
Brad Ebinger
4b2604d3d1 resolve merge conflicts of 17c69f5414 to pi-dev-plus-aosp 
Bug: 120986348
Bug: 120945804
Test: Treehugger
Merged-In: I4d7a203dd57050535867329c8dc36f8c75667c15
Change-Id: Ia2378265df93dd6b605b1b4af53e415c6ded1faf
 2019-01-16 00:11:38 +00:00
Andy Hung
ef0d3861a6 Merge "AudioFormat: Add IntRange annotation to getFrameSizeInBytes" 2019-01-16 00:08:41 +00:00
Quang Luong
122ce4d353 Merge "Display summary for unconnected OSU Provider APs" 2019-01-16 00:05:36 +00:00
Aurimas Liutikas
de784fbf3d Rerun update-api. It was out of sync. 
Test: make -j update-api
Bug: 122916999
Change-Id: I924d4da8474b69a88b6ff5350457df4e0aadd05c
 2019-01-15 16:02:56 -08:00
Chavi Weingarten
f9d1062118 Merge "Added turn on/off virtual display" 2019-01-15 23:53:08 +00:00
jonerlin
17e339ca88 Merge "AdapterService: Only bind HeadsetService in ON state." into pi-dev am: 4e3076b1a2 
am: d83144070c

Change-Id: I1b2ed5199e11b2a8169aa994c4b2a72620f262ff
 2019-01-15 15:37:02 -08:00
Xiangyu/Malcolm Chen
609ed3380f Merge "Make setMetered and setOpportunistic public." 2019-01-15 23:31:34 +00:00
Bo Liu
7b8c1eb302 VkFunctorDrawable implementation 
Bug: 115613038
Test: Turning on vulkan with appropriate webview apk does not crash and
sort of works.
Change-Id: If1504da7a35e4bd74a994ab2c2a351e6bc415a18
 2019-01-15 15:25:04 -08:00
Wei Jia
2b5dfbc265 MediaPlayer2: fix checking for next datasources 
Test: cts testPlaylist
Bug: 122073361
Change-Id: I0306b09b1f5d3796a4a74d4fe76a5c53d1ea6f57
 2019-01-15 15:12:52 -08:00
Robert Shih
b5fd613d16 Merge "MediaPlayer2: callback based DRM APIs" 2019-01-15 23:12:51 +00:00
jonerlin
d83144070c Merge "AdapterService: Only bind HeadsetService in ON state." into pi-dev 
am: 4e3076b1a2

Change-Id: I49ea80ea95e5c0a3351fb95fff84140298592356
 2019-01-15 15:11:08 -08:00
Quang Luong
02d81743b1 Display summary for unconnected OSU Provider APs 
OSU Provider APs should now display "Tap to set up" in their
summary in the wifi picker.

Tracking bug for adding robolectric tests: b/122849296

Test: manual, build and visual check
Bug: 118705403
Change-Id: I8ccf6bbe871f57b29b90fc07f5f71a26cc14ac63
 2019-01-15 15:06:07 -08:00
Brad Ebinger
17c69f5414 Merge "Expose WFC roaming Mode ISIM IST EF as SystemApi" 
am: 4ba30c1bec

Change-Id: I3ed77f8aaf5fd7fc495f70954f9497ec35722acf
 2019-01-15 15:06:06 -08:00
Dave Mankoff
785d3d27f4 Merge "Fix the library paths of plugins to allow loading native libraries." 2019-01-15 23:06:05 +00:00
Android Build Merger (Role)
70ccf3cdd1 Merge "[automerger skipped] Merge "Allow privileged carrier app to update subscription nickname." am: 81801283e3 am: a5972ee708 am: 93380ab8f3 -s ours am skip reason: change_id I63c5ec4366f32735a54adf40b9cc0b47af681736 with SHA1 5b44f9b4c2 is in history" 2019-01-15 22:59:12 +00:00
Holly Jiuyu Sun
1a60d1b2ac [automerger skipped] Merge "Allow privileged carrier app to update subscription nickname." am: 81801283e3 am: a5972ee708 
am: 93380ab8f3 -s ours
am skip reason: change_id I63c5ec4366f32735a54adf40b9cc0b47af681736 with SHA1 5b44f9b4c2 is in history

Change-Id: Ib63b0838baa4d55d6520172012b2e6f48da966db
 2019-01-15 14:58:30 -08:00
TreeHugger Robot
082e1f79d1 Merge "Implement gnssMeasurementCb_2_0" 2019-01-15 22:57:40 +00:00
Jean-Michel Trivi
4be2e3f81d Merge "AudioService: fix UID device affinity" 2019-01-15 22:45:22 +00:00
Treehugger Robot
4ba30c1bec Merge "Expose WFC roaming Mode ISIM IST EF as SystemApi" 2019-01-15 22:43:49 +00:00
TreeHugger Robot
ac729c48e9 Merge "PackageParser: Add support for parsing codeNames with fingerprints." 2019-01-15 22:42:52 +00:00
Holly Jiuyu Sun
93380ab8f3 Merge "Allow privileged carrier app to update subscription nickname." am: 81801283e3 
am: a5972ee708

Change-Id: I869efbd602fb484960dfca484b9ee4d9fb14ee5b
 2019-01-15 14:41:31 -08:00
TreeHugger Robot
4e3076b1a2 Merge "AdapterService: Only bind HeadsetService in ON state." into pi-dev 2019-01-15 22:34:37 +00:00
TreeHugger Robot
6a6bb92688 Merge "Add GnssNiEvent logging" 2019-01-15 22:34:32 +00:00
TreeHugger Robot
bd43f37be1 Merge "passpoint-r2: copy updateIdenfier field in the copy constructor" 2019-01-15 22:32:52 +00:00
David James
e3083a7617 Merge "Mark AppStateTrackerTest#testAllListeners as Flaky." am: 2a5005aca7 am: e112ed78d5 
am: f60ebe5cd2

Change-Id: Ife22928f9676ff10c23cc317b22e3e032424d513
 2019-01-15 14:30:12 -08:00
Holly Jiuyu Sun
a5972ee708 Merge "Allow privileged carrier app to update subscription nickname." 
am: 81801283e3

Change-Id: Ic8266c3cad813a21b2ef8b34c1a6825f5f3c231c
 2019-01-15 14:26:40 -08:00
Mady Mellor
7c73162d40 Merge "Create BubbleMetadata use it instead of app overlay intent" 2019-01-15 22:24:45 +00:00
David James
f60ebe5cd2 Merge "Mark AppStateTrackerTest#testAllListeners as Flaky." am: 2a5005aca7 
am: e112ed78d5

Change-Id: I6ed63c5efecf265ef9614c8d81a4a7343060fa8b
 2019-01-15 14:19:00 -08:00
Android Build Merger (Role)
fb89e1da2c Merge "Merge "[viewcompiler] Enable input from file descriptor" am: 040579c6a3 am: 88f9ca38fb am: 2c6aa62cee" 2019-01-15 22:12:21 +00:00
Eric Holk
a15f36a605 Merge "[viewcompiler] Enable input from file descriptor" am: 040579c6a3 am: 88f9ca38fb 
am: 2c6aa62cee

Change-Id: I4dac81fb372c64207bcc2748a99b8686bc53959b
 2019-01-15 14:11:54 -08:00
TreeHugger Robot
d526cb9019 Merge "Add skip and silence gestures" 2019-01-15 22:11:24 +00:00
Holly Jiuyu Sun
81801283e3 Merge "Allow privileged carrier app to update subscription nickname." 2019-01-15 22:09:10 +00:00
David James
e112ed78d5 Merge "Mark AppStateTrackerTest#testAllListeners as Flaky." 
am: 2a5005aca7

Change-Id: Idce0361e270b0fb7204200bf97fd7ee6b5d468e0
 2019-01-15 14:04:05 -08:00
TreeHugger Robot
b594e3e6e2 Merge "Reset binder/looper stats when statsd dies." 2019-01-15 22:03:49 +00:00
Amy
2fc3ab6d6f Fix crash on TV device from casting error. 
ag/5347939

Test: local tested
Bug: 118389063
Change-Id: I9d4649ee00fb27983ce6f0a09a6c7879ca0aba2a
 2019-01-15 14:03:21 -08:00
Amy
3288f8af60 When device reboots, it should not go to real standby. 
ag/5340093

This means the device should not do onStandby in HdmiControlService so
that it does not disable device or send out Inactive Source or turn off
system audio mode, etc.

Test: local tested.
Bug: 117106186, 116125794
Change-Id: I454a6d2266a35a223dd5d32338799d39e1e83ef7
 2019-01-15 14:01:53 -08:00
Nick Chalko
476e546b9e Use : hex format for HdmiCecMessage.toString 
ag/5340977

This format is used by both cec-client and www.cec-o-matic.com

Bug:117991662
Test: m -j; flashall; adb shell dumpsys hdmi_control
Change-Id: Icaf172a54eb776ca848d16f5e8384f17ae236207
 2019-01-15 14:01:40 -08:00