Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
353,553 Commits 3 Branches 0 Tags
b19dc2467ba36b75696a7900a907d96a0d35d3e2
Commit Graph

353553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yro
b19dc2467b Update statsd's user/group from root to system to avoid selinux policy 
violation

Bug: 71537285
Bug: 69853944
Test: manual verification to check there's no sepolicy violation

Change-Id: I639cf5c9f4ac6c434c3122c4f42fdf8bdac721f6
 2018-01-10 22:26:30 -08:00
TreeHugger Robot
d5a6d9b8dd Merge "[API review] Add ShortcutInfo.DISABLED_REASON_UNKNOWN" 2018-01-10 07:07:37 +00:00
Holly Jiuyu Sun
6a85d75fbc Merge "Merge EuiccProfile into EuiccProfileInfo." am: b01bd54b11 am: 6a5dc32ac3 
am: 20f35f962e

Change-Id: I8f7cc7e81fc163119ffa15666f054b298d47fff1
 2018-01-10 05:58:24 +00:00
Holly Jiuyu Sun
20f35f962e Merge "Merge EuiccProfile into EuiccProfileInfo." am: b01bd54b11 
am: 6a5dc32ac3

Change-Id: I3d6df6f2bce5b6e19ce0ef2c13adc39fa1b9a862
 2018-01-10 05:49:06 +00:00
Holly Jiuyu Sun
6a5dc32ac3 Merge "Merge EuiccProfile into EuiccProfileInfo." 
am: b01bd54b11

Change-Id: I98c726fc7d6fb91e16234773fe6423b7e111126e
 2018-01-10 05:35:48 +00:00
Holly Jiuyu Sun
b01bd54b11 Merge "Merge EuiccProfile into EuiccProfileInfo." 2018-01-10 05:21:35 +00:00
yinxu
9e68465043 Merge "Check null before calling clone()" am: e1bdd513d0 am: 1c60aa03fc 
am: 910cf3219c

Change-Id: I51ee6e90e464bfa1bae74ff8aacdf12378e15449
 2018-01-10 03:38:21 +00:00
yinxu
910cf3219c Merge "Check null before calling clone()" am: e1bdd513d0 
am: 1c60aa03fc

Change-Id: Ie06c696c8805e188d1af3121c66f3180a9845c16
 2018-01-10 03:28:45 +00:00
yinxu
1c60aa03fc Merge "Check null before calling clone()" 
am: e1bdd513d0

Change-Id: Ifabe6352c950f9d6ead4cbdd4345ef1fb20f065d
 2018-01-10 03:18:37 +00:00
Treehugger Robot
e1bdd513d0 Merge "Check null before calling clone()" 2018-01-10 03:07:26 +00:00
Jack Yu
35dfaa2d88 Merge "Exposed CDMA SID/NID get APIs" am: 0cb936a855 am: 46ffa48122 
am: e936a81557

Change-Id: I357f89c8d8ab7032710063e5cd6d2f761c9e1bb4
 2018-01-10 02:49:44 +00:00
Jack Yu
e936a81557 Merge "Exposed CDMA SID/NID get APIs" am: 0cb936a855 
am: 46ffa48122

Change-Id: I4693b44d59a312def9f26ad54badd5533cd36dfd
 2018-01-10 02:39:54 +00:00
TreeHugger Robot
7819f611de Merge "Add API EuiccController#startOtaUpdatingIfNecessary" 2018-01-10 02:38:11 +00:00
Jack Yu
46ffa48122 Merge "Exposed CDMA SID/NID get APIs" 
am: 0cb936a855

Change-Id: Iec76a777a126a10c012363247acb4b6a3516c008
 2018-01-10 02:33:16 +00:00
TreeHugger Robot
df449ee9c3 Merge "Revert "Move zygote's seccomp setup to post-fork"" 2018-01-10 02:31:08 +00:00
TreeHugger Robot
67d86e3990 Merge "Update recovery snapshot version." 2018-01-10 02:20:33 +00:00
Treehugger Robot
0cb936a855 Merge "Exposed CDMA SID/NID get APIs" 2018-01-10 02:19:20 +00:00
Elliott Hughes
14c2ae4a6e Merge "Remove obsolete workaround." am: f448371208 am: 365604c300 
am: 8ca799e22f

Change-Id: I6afd17cacebc896831f3b6049e850d671c2d7f73
 2018-01-10 01:55:14 +00:00
TreeHugger Robot
c27f70dc46 Merge "Avoid binder call on getAlwaysOn()" 2018-01-10 01:47:27 +00:00
Elliott Hughes
8ca799e22f Merge "Remove obsolete workaround." am: f448371208 
am: 365604c300

Change-Id: Ia153c371b8833b926b3e643bf265e67a438dfd91
 2018-01-10 01:46:14 +00:00
Android Build Merger (Role)
ff4a5395dc Merge "Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am: 72acefa6d8 am: b51df90f28 am: 23274614da" 2018-01-10 01:35:37 +00:00
Elliott Hughes
365604c300 Merge "Remove obsolete workaround." 
am: f448371208

Change-Id: I2bd057c12b9915b9e45b206b9839d1a57b296f26
 2018-01-10 01:35:34 +00:00
Cassie Han
b76d28fee3 Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am: 72acefa6d8 am: b51df90f28 
am: 23274614da

Change-Id: Id1b1667359a45259aea7d32cf7426f843ba0f33f
 2018-01-10 01:33:29 +00:00
Jerry Zhang
8f66b9eb29 Merge "Add setScreenUnlockedFunctions method to UsbManager" 2018-01-10 01:30:03 +00:00
Treehugger Robot
f448371208 Merge "Remove obsolete workaround." 2018-01-10 01:24:41 +00:00
Cassie Han
23274614da Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am: 72acefa6d8 
am: b51df90f28

Change-Id: I7045d6b684351e3545d24a52d16cb53d85483f20
 2018-01-10 01:20:42 +00:00
Cassie Han
b51df90f28 Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." 
am: 72acefa6d8

Change-Id: I25ad45c52cdcb9b4bf3d21f4f3b71c68e8ace362
 2018-01-10 01:08:55 +00:00
TreeHugger Robot
d4031658b0 Merge "Import translations. DO NOT MERGE" 2018-01-10 00:58:06 +00:00
Cassie Han
72acefa6d8 Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." 2018-01-10 00:55:32 +00:00
Victor Hsieh
551e5af0d4 Revert "Move zygote's seccomp setup to post-fork" 
This reverts commit a188dbc050.

Reason for revert: selinux denials, see b/71768585

Change-Id: Ic1b81e146b52b68445ba634de39657f199107da3
 2018-01-10 00:48:54 +00:00
Android Build Merger (Role)
974e4c6d39 Merge "Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am: b1065d6995 am: 8dbfc24e5f am: 96a01775ac" 2018-01-10 00:38:18 +00:00
TreeHugger Robot
ce5ed6e6f3 Merge "Rename createSHA256Parameters to createSha256Parameters" 2018-01-10 00:37:24 +00:00
Jack He
570c270d7b Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am: b1065d6995 am: 8dbfc24e5f 
am: 96a01775ac

Change-Id: I3a6d80fcc6c510ceec1b4f1411344cf644093677
 2018-01-10 00:36:06 +00:00
yinxu
f45c946421 Check null before calling clone() 
Bug: 67748005
Test: Basic telephony sanity

Change-Id: Ia46a82823b2d3c2bf3a6cb77a6fe191a7f7cb5d0
 2018-01-09 16:30:28 -08:00
Dmitry Dementyev
77183effbf Update recovery snapshot version. 
There is exactly one snapshot per userId - recovery agent uid pair.
Version is incremented when
1) User credential is updated
2) User unlockes phone and list of application keys was changes since
last snapshot creation.

Bug: 66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I6ab98fcbbb05e33958e6def644b40441cb52de6a
 2018-01-09 16:30:23 -08:00
Jack He
96a01775ac Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am: b1065d6995 
am: 8dbfc24e5f

Change-Id: I52fce02e6a0169dff418f4dae89ae54de7fd952d
 2018-01-10 00:26:33 +00:00
TreeHugger Robot
d6808dc0c0 Merge "E2e test: attribution matching and slicing by attribution." 2018-01-10 00:22:45 +00:00
TreeHugger Robot
032626a7ed Merge "WifiManager: startScan throttling" 2018-01-10 00:21:18 +00:00
Malcolm Chen
7051a1f992 Merge "Add isMobileDataEnabled in TelephonyManager." am: ed7eead23b am: 6b943d5deb 
am: 904340088a  -s ours

Change-Id: Id32dd08ebec6e0f90a08a360ce1b6488adbeab40
 2018-01-10 00:18:56 +00:00
Jack He
8dbfc24e5f Merge "HFP: Add isInbandRingingEnabled() API (1/4)" 
am: b1065d6995

Change-Id: Ia3112caa3971406cb0ef44cc25c19865a0b6ddf1
 2018-01-10 00:18:15 +00:00
TreeHugger Robot
a13c47694f Merge "Fix small but crashy edge case in Icon.scaleDown" 2018-01-10 00:09:16 +00:00
Android Build Merger (Role)
151c52c009 Merge "Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am: d195a9972b am: 800e061359 am: 0630348fa5 am: 14f71757c2 -s ours" 2018-01-10 00:08:22 +00:00
Kevin Hufnagle
3e8d96502e Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am: d195a9972b am: 800e061359 am: 0630348fa5 
am: 14f71757c2  -s ours

Change-Id: I1bfff1823386d65c8981e4b9edd99f60571df13c
 2018-01-10 00:07:52 +00:00
Treehugger Robot
b1065d6995 Merge "HFP: Add isInbandRingingEnabled() API (1/4)" 2018-01-10 00:07:11 +00:00
Malcolm Chen
904340088a Merge "Add isMobileDataEnabled in TelephonyManager." am: ed7eead23b 
am: 6b943d5deb

Change-Id: I132cc6d3de77f20717a40884683fb0c81fbb7083
 2018-01-10 00:06:27 +00:00
Amith Yamasani
a0ee7c35e2 Merge "Track last job run time" 2018-01-10 00:05:22 +00:00
Kevin Hufnagle
14f71757c2 Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am: d195a9972b am: 800e061359 
am: 0630348fa5

Change-Id: I0ccaa18cf5a9e84c5f015cf4b97b74a249348c93
 2018-01-09 23:59:29 +00:00
Malcolm Chen
6b943d5deb Merge "Add isMobileDataEnabled in TelephonyManager." 
am: ed7eead23b

Change-Id: I851529bc4b5507ffa04c07a840aeba6eb3c7f94b
 2018-01-09 23:55:47 +00:00
TreeHugger Robot
aacb53a34d Merge "Use String instead of byte[] to represent alias in KeyEntryRecoveryData." 2018-01-09 23:54:21 +00:00
Kevin Hufnagle
0630348fa5 Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am: d195a9972b 
am: 800e061359

Change-Id: I3854641ab4f80f4bbeae9acd67522fcd8b8484c0
 2018-01-09 23:51:10 +00:00