TreeHugger Robot
bf90b7c3d4
Merge "Import translations. DO NOT MERGE"
2017-12-19 07:12:23 +00:00
TreeHugger Robot
ae8e172d25
Merge "Import translations. DO NOT MERGE"
2017-12-19 07:04:34 +00:00
TreeHugger Robot
774b335678
Merge "Increase screen-on delay in ConnOnActivityStartTest."
2017-12-19 04:58:42 +00:00
Bill Yi
9b6ee2c3a1
Import translations. DO NOT MERGE
...
Change-Id: I221002ba36f7421b5f894f4db4ef05ecf5e4e16f
Auto-generated-cl: translation import
2017-12-18 19:44:46 -08:00
TreeHugger Robot
0817c33271
Merge "Add RecoverableKeyStoreLoader implementation in LockSettingsService."
2017-12-19 03:17:29 +00:00
TreeHugger Robot
81bfe137d0
Merge "Remove IIncidentReportCompleted and gmscore WW module would listen to android.intent.action.DROPBOX_ENTRY_ADDED and look up incident tag then upload the report."
2017-12-19 02:30:28 +00:00
Bill Yi
66f5f8dda0
Import translations. DO NOT MERGE
...
Change-Id: If9842d6d8f20245c2e29ec0827e859135d2e8916
Auto-generated-cl: translation import
2017-12-18 18:10:17 -08:00
TreeHugger Robot
aea342e9ed
Merge "align metrics start time to the previous 5 min start, instead of the next 5 min start. Also refactor config check condition to be more readable."
2017-12-19 01:51:50 +00:00
Sudheer Shanka
1184457d8f
Increase screen-on delay in ConnOnActivityStartTest.
...
Test: ran the test.
Change-Id: Ib3ae7719b2621877f5dbeea0de8d18cdebfbd3b9
2017-12-18 17:46:31 -08:00
TreeHugger Robot
67e5a79e4d
Merge "incidentd: Adding graphicsstats dump."
2017-12-19 01:34:49 +00:00
Sean Stout
9ebe2cb6fe
Merge "Renaming a file causes it to be rescanned"
2017-12-19 01:14:30 +00:00
TreeHugger Robot
60a3c1e313
Merge "incidentd: Dumping java process meminfo data."
2017-12-19 01:07:49 +00:00
Steve Paik
0298d2bba0
Merge "Rename set_wakeup_callback" am: 7e3de17f3d am: 5611305abe
...
am: 9eb7d2e002
2017-12-19 00:56:33 +00:00
Elliott Hughes
d2cafca090
Merge "Private API became public..." am: eb44ebbfcd am: 85fc4d6dd6
...
am: 746a738276
2017-12-19 00:50:31 +00:00
Benedict Wong
ebf59a8962
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: d0ac50bcad am: 8caa274ade
...
am: 9de5c77303
2017-12-19 00:41:55 +00:00
Steve Paik
9eb7d2e002
Merge "Rename set_wakeup_callback" am: 7e3de17f3d
...
am: 5611305abe
2017-12-19 00:40:59 +00:00
Elliott Hughes
746a738276
Merge "Private API became public..." am: eb44ebbfcd
...
am: 85fc4d6dd6
2017-12-19 00:35:58 +00:00
TreeHugger Robot
4316d8ecde
Merge "Move heavy-weight process state down to cached range."
2017-12-19 00:29:31 +00:00
Steve Paik
5611305abe
Merge "Rename set_wakeup_callback"
...
am: 7e3de17f3d
2017-12-19 00:29:22 +00:00
Benedict Wong
9de5c77303
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: d0ac50bcad
...
am: 8caa274ade
2017-12-19 00:27:57 +00:00
Elliott Hughes
85fc4d6dd6
Merge "Private API became public..."
...
am: eb44ebbfcd
2017-12-19 00:24:28 +00:00
Hugo Benichi
9662647251
Merge changes I798d8fec,I4a2d5866 am: c5212b6654 am: 99be302c71
...
am: fe9e89820d
2017-12-19 00:23:04 +00:00
TreeHugger Robot
84a41d6684
Merge changes from topic "aod_wallpapers"
...
* changes:
Hide AoD wallpaper after 1min
Support wallpapers in AoD
2017-12-19 00:18:49 +00:00
Benedict Wong
8caa274ade
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets"
...
am: d0ac50bcad
2017-12-19 00:16:29 +00:00
Treehugger Robot
7e3de17f3d
Merge "Rename set_wakeup_callback"
2017-12-19 00:06:15 +00:00
Hugo Benichi
fe9e89820d
Merge changes I798d8fec,I4a2d5866 am: c5212b6654
...
am: 99be302c71
2017-12-19 00:06:00 +00:00
TreeHugger Robot
492511701f
Merge "Add popup item content to id/content where applicable"
2017-12-19 00:05:31 +00:00
Dmitry Dementyev
1aa96132bd
Add RecoverableKeyStoreLoader implementation in LockSettingsService.
...
1) Updates to ILockSettings.aidl
Since we can't pass arbitrary exception using IPC, Serrvice
converts them to ServiceSpecificException with an error code.
2) Added RecoverableKeyStoreManager class which is used as interface
between RecoverableKeyStoreLoader implementation and
LockSettingsService.
Test: none
Bug: 66499222
Change-Id: I03b695bc0ced1a91ea7ca5de179e121053dfe416
2017-12-18 16:04:15 -08:00
Elliott Hughes
eb44ebbfcd
Merge "Private API became public..."
2017-12-18 23:58:15 +00:00
Hugo Benichi
99be302c71
Merge changes I798d8fec,I4a2d5866
...
am: c5212b6654
2017-12-18 23:57:15 +00:00
Chenjie Yu
2b4fc9d657
align metrics start time to the previous 5 min start, instead
...
of the next 5 min start. Also refactor config check condition
to be more readable.
Test: unit test
Change-Id: Iaa6b4a59d27c52996723862d92080d90c9e794cb
2017-12-18 15:53:18 -08:00
Ying Xu
2438977f27
Merge "Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL" am: 7be7d422a2 am: 784a690ec7
...
am: 74ee537cca
2017-12-18 23:51:01 +00:00
Benedict Wong
d0ac50bcad
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets"
2017-12-18 23:50:52 +00:00
Hugo Benichi
c5212b6654
Merge changes I798d8fec,I4a2d5866
...
* changes:
MacAddress: address api review comments
Expose the MacAddress class in the api
2017-12-18 23:43:06 +00:00
Ying Xu
74ee537cca
Merge "Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL" am: 7be7d422a2
...
am: 784a690ec7
2017-12-18 23:42:03 +00:00
Kweku Adams
9a478d2e32
incidentd: Adding graphicsstats dump.
...
Thanks to ag/3249934, the graphicsstats.proto file no longer needs to
explicitly declare "optimize_for = LITE_RUNTIME".
Bug: 65750815
Test: flash device and check incident.proto output.
Change-Id: I2d3d44d5351c225b2cd45bab0ed3a435a4467187
2017-12-18 23:37:52 +00:00
Ying Xu
784a690ec7
Merge "Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL"
...
am: 7be7d422a2
2017-12-18 23:34:51 +00:00
Ying Xu
7be7d422a2
Merge "Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL"
2017-12-18 23:26:25 +00:00
Robert Berry
112d5f09ce
Merge "Add PlatformEncryptionKey (again)"
2017-12-18 23:24:44 +00:00
Kweku Adams
983829fec5
incidentd: Dumping java process meminfo data.
...
Bug: 65750823
Test: flash device and check incident.proto output
Change-Id: I9b10daddf0580b3fab4ed7970fb838a605eef0e6
2017-12-18 15:19:13 -08:00
Dianne Hackborn
f097d42f0c
Move heavy-weight process state down to cached range.
...
This allows us to generally treat heavy-weight processes in
the background as cached processes, applying all of the limitations
we want for such things -- disable wake locks, etc.
Test: run-am-test ActivityManagerProcessStateTest
Bug: 63937884
Change-Id: I7c140c8f48188f6aa9c09731e83e3db4e4405e77
2017-12-18 14:54:08 -08:00
Fyodor Kupolov
93592a9b39
Merge "Enabled SQLiteCompatibilityWalFlags class"
2017-12-18 22:29:31 +00:00
Siyamed Sinir
40656e3dbe
Merge "Presubmit FormatterTest and SpannableStringBuilderTest"
2017-12-18 22:24:53 +00:00
Android Build Merger (Role)
5e7017b548
Merge "Merge "Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am: bef8c59634 am: 826657a9c2" into oc-mr1-dev-plus-aosp am: 11448df5a1 -s ours"
2017-12-18 22:15:26 +00:00
Android Build Merger (Role)
06cac97a3a
Merge "Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am: bef8c59634 am: 826657a9c2" into oc-mr1-dev-plus-aosp
...
am: 11448df5a1
2017-12-18 22:14:52 +00:00
Android Build Merger (Role)
91a92b9a7a
Merge "docs: Touch-up edits to ShortcutManager class reference. am: 4777f37f78 am: 6f2f0f639b"
2017-12-18 22:08:50 +00:00
TreeHugger Robot
679436ad60
Merge "Add isMobileDataEnabled in TelephonyManager."
2017-12-18 22:08:38 +00:00
Kevin Hufnagle
1c48aea609
docs: Touch-up edits to ShortcutManager class reference. am: 4777f37f78
...
am: 6f2f0f639b
2017-12-18 22:07:56 +00:00
Android Build Merger (Role)
11448df5a1
Merge "Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am: bef8c59634 am: 826657a9c2" into oc-mr1-dev-plus-aosp
2017-12-18 21:57:05 +00:00
Benedict Wong
570970f6b2
Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am: bef8c59634
...
am: 826657a9c2
2017-12-18 21:56:41 +00:00
