Commit Graph

89172 Commits

Author SHA1 Message Date
Sunny Goyal
7e10028abc Merge "Updating java doc for requestPinAppWidget" into pi-dev am: dbb0a49f00
am: 1f42bf5b6d

Change-Id: I0d4ecbd0a7e164a892cfcfa6ee2734c5deac1a3e
2018-03-20 06:48:21 +00:00
Alice Sheng
20f6e59d58 Merge "Revert "Add setting for enabling CPU frequency scaling."" into pi-dev am: 7723aed494
am: 4aa94a7c50

Change-Id: Id2d785bd171e9ef5803b65cb6f4b82ae93005701
2018-03-20 06:13:31 +00:00
Kweku Adams
bd62a2b5ea Merge "Removing the settings-based IncidentReportArgs method." into pi-dev am: 46c0e91b74
am: 148d986e62

Change-Id: Ib8155edff17903fa6bf775c6809498f032ea611d
2018-03-20 04:54:20 +00:00
Sunny Goyal
1f42bf5b6d Merge "Updating java doc for requestPinAppWidget" into pi-dev
am: dbb0a49f00

Change-Id: I97d558e9dcd3c4e47e7f1e33a7e74e1d1de5aab9
2018-03-20 04:35:27 +00:00
Shuzhen Wang
ff1b149443 Merge "Camera2: Use Set for physical camera IDs" into pi-dev am: 83c4690f55
am: f1b5a2a866

Change-Id: Ic6624159009c3dc5d312ab27be4aa9ec4e690686
2018-03-20 03:43:47 +00:00
Robert Berry
4f78109b5f Merge "Move trusted CA certs to core" into pi-dev am: f679bda843
am: 4d549c21ff

Change-Id: I7329c070aae09104e004d94c53b8d80b85dbbdbf
2018-03-20 03:30:36 +00:00
Alice Sheng
4aa94a7c50 Merge "Revert "Add setting for enabling CPU frequency scaling."" into pi-dev
am: 7723aed494

Change-Id: Ibc6fb095d97e53b9bd95b58e1fbbb77a92d24145
2018-03-20 03:25:22 +00:00
Andreas Gampe
499cb417ba Merge "Frameworks: Fix Binder.joinThreadPool" into pi-dev am: 0f8f3f25cf
am: 1833e68f13

Change-Id: I76bace7420611fb344640a4e64e9552f527be6a7
2018-03-20 03:01:57 +00:00
Benedict Wong
9886ba928b Merge "Merge "Added implementation for VTI add/remove address" am: 2543fbd8a2 am: 9dda91f806" into pi-dev-plus-aosp
am: 7bec751fe6

Change-Id: I52bf3f1ae4739efe36641f06007adf3dd9ae9312
2018-03-20 02:55:27 +00:00
Roshan Pius
265efbd527 Merge "Settings: Remove unused bg scan throttle settings" into pi-dev
am: f4f317798b

Change-Id: Ifb8dcd8b7d98bf427864651d5a80b4d2efbb3d77
2018-03-20 02:31:23 +00:00
Siyamed Sinir
90d17942e1 Merge "Fix rounding error related to autoSize" into pi-dev
am: 46c84bf237

Change-Id: I0c8b7c4b21d0980547025ebd58189a637020b209
2018-03-20 02:23:42 +00:00
Kweku Adams
148d986e62 Merge "Removing the settings-based IncidentReportArgs method." into pi-dev
am: 46c0e91b74

Change-Id: I19be9d6a6c3b1674dada4eaaf36faf2e555a8b79
2018-03-20 02:20:03 +00:00
Sunny Goyal
dbb0a49f00 Merge "Updating java doc for requestPinAppWidget" into pi-dev 2018-03-20 02:07:48 +00:00
Selim Cinek
dd1e17cd19 Merge "Dispatching display list recreations also to transient views" into pi-dev am: 036a2409fc
am: b348343320

Change-Id: Ic2cc1250f5223060d880a37437c59208d85ac0d9
2018-03-20 01:49:28 +00:00
Adam Powell
01851d5060 Merge "Add factory methods for async Handlers" into pi-dev am: fa38f238b1
am: d40f30610e

Change-Id: I49741a8142f377eefa0651d2ac5ea6292a240b49
2018-03-20 01:44:44 +00:00
David Chen
27c3ab17f7 Merge "Small fixes to StatsManager API." into pi-dev am: 96e680cb90
am: 1cc4099e80

Change-Id: Ib43baaa36d33fb8445ef694cfbfbff4b19543a6b
2018-03-20 01:41:36 +00:00
Tej Singh
b52d6f14aa Merge "Merge "Atoms: Mobile Connection" into pi-dev am: dba47fcd09" into pi-dev-plus-aosp
am: 0a4a9248b5

Change-Id: I6c028678eb91627ae3c36db76e23f5237abf4c28
2018-03-20 01:12:26 +00:00
Shuzhen Wang
f1b5a2a866 Merge "Camera2: Use Set for physical camera IDs" into pi-dev
am: 83c4690f55

Change-Id: I11c86616264823d52e71e15db350ba6b588099b5
2018-03-20 01:04:20 +00:00
Robert Carr
a0aa0ca866 Merge "Merge "SurfaceView: Expose hook for subclass to position child surfaces." into pi-dev am: 89b182890c" into pi-dev-plus-aosp
am: 331561fb52

Change-Id: I00e9ad45911d0c9b7e411bff6064303b41a96283
2018-03-20 00:58:36 +00:00
Robert Berry
4d549c21ff Merge "Move trusted CA certs to core" into pi-dev
am: f679bda843

Change-Id: I280586e435a15974dd1658e3e155fe959ccb373e
2018-03-20 00:49:13 +00:00
Tracy Zhou
8002e7f96c Merge "Move default pip position to right above the shelf." into pi-dev am: 017f44be88
am: 6f9ebab4ed

Change-Id: I65e587befec2dcba43b95fe6c6d8775a918fd332
2018-03-20 00:34:39 +00:00
Andreas Gampe
1833e68f13 Merge "Frameworks: Fix Binder.joinThreadPool" into pi-dev
am: 0f8f3f25cf

Change-Id: Ib537886c003f4f4877a1fb4a89ad9ca25f603aea
2018-03-20 00:27:23 +00:00
Felipe Leme
17542558dd Merge "Fixed isVisibleToUserForAutofill() again." into pi-dev am: e24c95fac5
am: c8ca9aa394

Change-Id: Id470cc15a58f2c7f480966ee33ef415cafb08579
2018-03-20 00:21:04 +00:00
Android Build Merger (Role)
7bec751fe6 Merge "Merge "Added implementation for VTI add/remove address" am: 2543fbd8a2 am: 9dda91f806" into pi-dev-plus-aosp 2018-03-20 00:09:43 +00:00
Benedict Wong
2e67bf5cac Merge "Added implementation for VTI add/remove address" am: 2543fbd8a2
am: 9dda91f806

Change-Id: Idaab45998f4765655bde6cf0274f2ba3c1b3ecf1
2018-03-20 00:09:15 +00:00
Ajay Nadathur
e9c0e21d44 Merge "Add setupwizard personalisation state to Settings" into pi-dev
am: e9b60f2cd3

Change-Id: Idd6fbd7415316ffe8e6641ec2becb99c6d48329d
2018-03-20 00:07:13 +00:00
Benedict Wong
9dda91f806 Merge "Added implementation for VTI add/remove address"
am: 2543fbd8a2

Change-Id: Id49ef89d3076c9a6d5257b006965844ab77743ce
2018-03-19 23:45:10 +00:00
Selim Cinek
b348343320 Merge "Dispatching display list recreations also to transient views" into pi-dev
am: 036a2409fc

Change-Id: I2efbf117542eda421fa5e263b8b8a410b2b29a65
2018-03-19 23:24:38 +00:00
Adam Powell
d40f30610e Merge "Add factory methods for async Handlers" into pi-dev
am: fa38f238b1

Change-Id: I0dee61e5dbd2a21bbd03c06cde72a66a708bc55f
2018-03-19 23:21:29 +00:00
Andreas Gampe
24623dc2ac Merge "Frameworks: Handle exceptions in SystemProperties callbacks" am: af3dc4fc70 am: bccdf32c8a
am: a3c96c1524

Change-Id: Ie0b93a09e01a87b1f14b7733cee493baad54a6d4
2018-03-19 23:21:20 +00:00
David Chen
1cc4099e80 Merge "Small fixes to StatsManager API." into pi-dev
am: 96e680cb90

Change-Id: I2d7e2a204c91ed7a824002111452286e5efa4977
2018-03-19 23:16:51 +00:00
Tej Singh
3e39b508f1 Merge "Atoms: Mobile Connection" into pi-dev
am: dba47fcd09

Change-Id: I3008bae7f5ecebbbb79fbe141479d25c6c5f5867
2018-03-19 22:54:01 +00:00
Robert Carr
d0232c6aa2 Merge "SurfaceView: Expose hook for subclass to position child surfaces." into pi-dev
am: 89b182890c

Change-Id: I2ad5181dab33597fc9a917bf8cdd0d83e6f0466a
2018-03-19 22:46:11 +00:00
Alice Sheng
7723aed494 Merge "Revert "Add setting for enabling CPU frequency scaling."" into pi-dev 2018-03-19 22:38:25 +00:00
Tracy Zhou
6f9ebab4ed Merge "Move default pip position to right above the shelf." into pi-dev
am: 017f44be88

Change-Id: I0b61860bedd0b949dbd2b2f87b10149c3577559b
2018-03-19 22:37:06 +00:00
Alice Sheng
6750352248 Revert "Add setting for enabling CPU frequency scaling."
This reverts commit 2e8afd8736.

Reason for revert: SELinux Boot crash
Bug: 75974893

Change-Id: I4751530a1b460842130a495efe688aaf19b92638
2018-03-19 22:36:52 +00:00
Felipe Leme
c8ca9aa394 Merge "Fixed isVisibleToUserForAutofill() again." into pi-dev
am: e24c95fac5

Change-Id: I1e1bf92156608ca8c4296145a5ccd9775888dd78
2018-03-19 22:33:14 +00:00
Seigo Nonaka
8d2084e84c Merge "Revert "Make PrecomputedText Spannable for supporting selection"" into pi-dev am: b3aec698e8
am: efd7a037d0

Change-Id: I4abfd9ade6928106f21a598dd33ab5be5e86d1b8
2018-03-19 22:28:28 +00:00
TreeHugger Robot
f4f317798b Merge "Settings: Remove unused bg scan throttle settings" into pi-dev 2018-03-19 22:24:04 +00:00
Siyamed Sinir
46c84bf237 Merge "Fix rounding error related to autoSize" into pi-dev 2018-03-19 22:15:31 +00:00
TreeHugger Robot
46c0e91b74 Merge "Removing the settings-based IncidentReportArgs method." into pi-dev 2018-03-19 22:15:11 +00:00
Benedict Wong
2543fbd8a2 Merge "Added implementation for VTI add/remove address" 2018-03-19 22:05:09 +00:00
TreeHugger Robot
83c4690f55 Merge "Camera2: Use Set for physical camera IDs" into pi-dev 2018-03-19 22:02:58 +00:00
Felipe Leme
506954cd9e Merge "Cosmetic changes on Field Classification TODOs and docs." into pi-dev am: a96583edf6
am: 237773621d

Change-Id: I1a959ebe36328ceafc57dfdc821877841af89e14
2018-03-19 21:53:00 +00:00
Alice Sheng
23164d63a6 Merge "Add setting for enabling CPU frequency scaling." into pi-dev am: 1799f2b878
am: 4eafb6299d

Change-Id: I35f597767a1025fb17352016682c2f49ea8676ce
2018-03-19 21:48:31 +00:00
TreeHugger Robot
f679bda843 Merge "Move trusted CA certs to core" into pi-dev 2018-03-19 21:44:23 +00:00
TreeHugger Robot
0f8f3f25cf Merge "Frameworks: Fix Binder.joinThreadPool" into pi-dev 2018-03-19 21:40:37 +00:00
Andreas Gampe
a3c96c1524 Merge "Frameworks: Handle exceptions in SystemProperties callbacks" am: af3dc4fc70
am: bccdf32c8a

Change-Id: Ie640cf1734ff80a19d8c0ba65734f5e76d26fa76
2018-03-19 21:38:59 +00:00
Felipe Leme
6f2b0a0820 Merge "Merge "Fixed AutofillManager.isAutofillUiShowing()" into pi-dev am: a946d88011" into pi-dev-plus-aosp
am: 7509f73970

Change-Id: I9cc686a6dd13fc824f12591f5e419796a8c6d12f
2018-03-19 21:29:13 +00:00
TreeHugger Robot
e9b60f2cd3 Merge "Add setupwizard personalisation state to Settings" into pi-dev 2018-03-19 21:26:37 +00:00