Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
377,494 Commits 3 Branches 0 Tags
7843e757d38fca574d31f53eaab60ed34a072df5
Commit Graph

377494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Huang
7843e757d3 Merge "Refine firewall-related commands" 2018-10-29 00:16:30 +00:00
Treehugger Robot
bd4ae82f66 Merge "allow statsd pull based on event trigger." 2018-10-27 03:51:31 +00:00
gopinath
9d426e141d allow statsd pull based on event trigger. 
Bug: b/118482428

Test: make statsdprotolite
Change-Id: I5a40d5e6a409b65ca1639029d5da83c327ed1798
Merged-In: Ia15b1f209945f022edffb9ec5d673317d55d9e4f
 2018-10-26 22:22:51 +00:00
Chalard Jean
e42fbe4606 Merge "ConnectivityService: make log configurable" 2018-10-26 06:06:19 +00:00
Junyu Lai
5c67de8417 Merge "No-op refactoring of VPN lockdown status check." 2018-10-26 05:35:28 +00:00
Treehugger Robot
866a9678d2 Merge "Update test cases for HarfBuzz 2.0.2" 2018-10-26 05:19:41 +00:00
Hall Liu
bd46b1c4a2 Merge "Move Binder.clearCallingIdentity" 2018-10-26 01:35:24 +00:00
Xiangyu/Malcolm Chen
923bbad67a Merge "Add @NonNull in SubMgr#getOpportunisticSubscriptions return value." 2018-10-26 01:30:21 +00:00
Seigo Nonaka
3e140b2403 Update test cases for HarfBuzz 2.0.2 
Now HarfBuzz combines chars with ZWJ into single cluster

This is 2nd attempt of Ic642c469aab90a2ecd3874cf0dec82625ea21c1b

Bug: 117953171
Test: TreeHugger
Change-Id: I7e731500e71c1973c254ede0f316fc36e3c22576
Merged-In: I531b7a5f5727540d6d11db619eeba6eb23fb113d
 2018-10-25 22:15:33 +00:00
Pengquan Meng
4d3f84fddb Merge "Set default value to false for show4GForLte" 2018-10-25 20:47:41 +00:00
Seigo Nonaka
487ecbfc6c Merge "Revert "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE"" 2018-10-25 18:26:33 +00:00
Seigo Nonaka
52a4c07f7c Revert "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE" 
This reverts commit 155951f2f6.

Reason for revert: broke test in pi-dev/stage-aosp-master

Change-Id: I917e170b570b89ba2e8a26cec0bf0a8adf577b80
 2018-10-25 18:23:32 +00:00
Treehugger Robot
07ac5d600c Merge "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE" 2018-10-25 16:42:11 +00:00
Treehugger Robot
20add0a4c6 Merge "Import translations. DO NOT MERGE" 2018-10-25 10:36:36 +00:00
Junyu Lai
48f337457b Merge "Add more debug log when onBlockedStatusChanged was called." 2018-10-25 08:57:56 +00:00
junyulai
8ed8915e53 No-op refactoring of VPN lockdown status check. 
Currently, if VPN lockdown is disabled, the blocking judgement
inside VPN will return false immediately. It will make
ConnectivityService hard to check blocked status by a given
VPN lockdown status.

Thus, move this check into ConnectivityService and check it
externally.

Bug: 117814902
Test: 1. manual test with 3rd-party vpn app
      2. runtest frameworks-net

Change-Id: Ia8319b1a1a12f1058c24badf2431f2ec69bc78e7
 2018-10-25 16:43:50 +08:00
junyulai
e6b3651c75 Add more debug log when onBlockedStatusChanged was called. 
Bug: 118355916
Test: 1. runtest frameworks-net
      2. enable/disable battery saver

Change-Id: I6d5f9b49be0defd531fc7ea824668bec7863c4b7
 2018-10-25 15:20:01 +08:00
Bill Yi
a9ab592e8f Import translations. DO NOT MERGE 
Change-Id: Ie2e07cbd6d038a83b2f05b315b647a35872f6daf
Auto-generated-cl: translation import
 2018-10-24 23:18:42 -07:00
Luke Huang
615e1023f2 Refine firewall-related commands 
Test: runtest frameworks-net passes
Test: manual testing of firewall works
Change-Id: I272bb54ffcde72d04cbcf550e31dafeeb00f1ce2
 2018-10-25 12:05:57 +09:00
Chong Zhang
6636b0227d Merge "Add keys to retrieve color aspects from metadata" 2018-10-25 02:04:48 +00:00
Chong Zhang
e4c918ba8e Merge "Color aspects keys information stored database" 2018-10-25 02:04:48 +00:00
Xiangyu/Malcolm Chen
6f7d3848c5 Merge "Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM." 2018-10-25 01:37:34 +00:00
Luke Huang
1acfa7de1b Merge "Firewall-related commands porting" 2018-10-25 00:20:12 +00:00
Pengquan Meng
cdb6c68ed1 Set default value to false for show4GForLte 
Bug: 118375031
Test: build
Change-Id: I542bfcbf5e88748321f75bdf3bdd5faa214360ea
 2018-10-24 15:43:50 -07:00
Malcolm Chen
56f9f857ea Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM. 
Bug: 80268699
Test: unittest
Change-Id: Ifda606784f97c1bfa03fb424fd488bb0b5e6ebec
Merged-In: Ifda606784f97c1bfa03fb424fd488bb0b5e6ebec
 2018-10-24 15:18:52 -07:00
Bill Yi
8b634e9191 Merge pie-platform-release to aosp-master - DO NOT MERGE 
Change-Id: I695db52f5e22509401258e8b083e7650d401d993
 2018-10-24 14:48:44 -07:00
Brad Ebinger
1e8249a1d6 Merge "Remove obsolete @VisibleForTesting Annotation" 2018-10-24 20:15:35 +00:00
Brad Ebinger
a1474266bf Merge "ImsSsData needs a public constructor for vendors to use" 2018-10-24 17:08:39 +00:00
Youming Ye
94fe6430ea Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting"" 2018-10-24 16:26:21 +00:00
Tony Zhu
ee31b2214d Merge "[Call Screening]Support for carrier call screening app" 2018-10-24 15:51:48 +00:00
Chalard Jean
a01c77a499 Merge "To support skip464xlat per Network" 2018-10-24 07:15:20 +00:00
Seigo Nonaka
155951f2f6 Update test cases for HarfBuzz 2.0.2 DO NOT MERGE 
Now HarfBuzz combines chars with ZWJ into single cluster

Bug: 117953171
Test: TreeHugger
Change-Id: Ic642c469aab90a2ecd3874cf0dec82625ea21c1b
Merged-In: I531b7a5f5727540d6d11db619eeba6eb23fb113d
 2018-10-24 05:57:57 +00:00
Luke Huang
a241db9df7 Firewall-related commands porting 
Test: runtest frameworks-net passes
Test: manual testing of firewall works
Change-Id: Ic19c3872988a2b5dd315feb57e0757797d00a6ac
 2018-10-24 13:12:41 +09:00
Treehugger Robot
82696f8e4c Merge "Refine network-related commands porting" 2018-10-24 03:15:41 +00:00
Chiachang Wang
9514b362cd Merge "Move captive portal detection to another thread" 2018-10-24 03:02:58 +00:00
Hall Liu
a82f952fe7 Merge "Add test API to override carrier config" 2018-10-24 00:00:22 +00:00
Toshikazu Saito
26b3de310f Add keys to retrieve color aspects from metadata 
Add keys to retrieve color standard, color transfer and color range from
MediaMetadataRetriever.

Bug: 114329709
Test: put hdr/non-hdr contents and check media db

Change-Id: Ifa90f12a572b330f87acd6ef06e1e83ddceb8483
 2018-10-23 23:37:31 +00:00
Nathan Harold
ac87c0a884 Merge "Add getMobileNetworkOperator to CellIdentityTdscdma" 2018-10-23 23:34:26 +00:00
Brad Ebinger
8853179fa7 Remove obsolete @VisibleForTesting Annotation 
Bug: 118296374
Test: atest FrameworksTelephonyTests
Change-Id: I5156db7d199f89307ca7c602bfc855dbc6ae236e
 2018-10-23 15:46:59 -07:00
Treehugger Robot
b25190cf62 Merge "Fix for android.hardware.radio.Utils.createIntSet" 2018-10-23 22:18:55 +00:00
nobuhiko saitou
839cc00889 Color aspects keys information stored database 
Add keys for color aspects to VideoColumns in MediaStore.
And standard, transfer and range is stored to database.

Bug: 114329709
Test: put hdr/non-hdr contents and check media db

Change-Id: Id4bf27a35720f5cf5a60f08eb3f30314e1a1a167
 2018-10-23 22:03:30 +00:00
Nathan Harold
c65e610c06 Merge "Remove Hidden TimestampType From CellInfo" 2018-10-23 22:02:15 +00:00
Brad Ebinger
4123f9587d ImsSsData needs a public constructor for vendors to use 
Expose Builder for IMS Supp Service APIs as well as clean
up some of the ambiguous int[] usage.

Bug: 117555643
Test: Manual
Change-Id: I5cad08e0a032f4e38a62ac033c01111319cf9fd5
 2018-10-23 14:57:59 -07:00
Nathan Harold
f5cf9f24ed Merge "Move some members to the "Q blacklist"." 2018-10-23 21:53:51 +00:00
Tyler Gunn
a94a71af13 Merge "Re-add removed APIs per API council feedback." 2018-10-23 20:49:43 +00:00
Jan Kowal
d09a4081d6 Fix for android.hardware.radio.Utils.createIntSet 
Previous solution was assymetric: writeInt vs readTypedObject.

Also, specify the initial capacity to avoid unnecessary reallocations.

Bug: 117113131
Test: atest BroadcastRadioTests
Change-Id: Ib33b97d482422b1acac8e9420a0c974bcd59355b
 2018-10-23 13:33:51 -07:00
Hall Liu
e5b1fda883 Add test API to override carrier config 
Add API surface and AIDL to enable override functionality for CTS

Change-Id: I55328a75f16fe91280530dd348d4a034694be6e9
Fixes: 118184943
Test: manually call api through shell cmd
 2018-10-23 13:14:36 -07:00
Treehugger Robot
31bbb473ce Merge "Fix data source for HEIF exif extractor" 2018-10-23 17:36:33 +00:00
Treehugger Robot
0915931939 Merge "Change caught exception in MediaScanner when ExifInterface is created" 2018-10-23 17:36:33 +00:00
Xiangyu/Malcolm Chen
0875fbab4b Merge "Add PhoneStateListener#onPreferredDataSubIdChanged" 2018-10-23 17:03:22 +00:00