Xiangyu/Malcolm Chen
973d4bc7db
Merge "Clean new TelephonyManager API." into pi-dev am: 2fc8197b4d
...
am: d0846cfb7c
2018-03-28 01:14:14 +00:00
Dianne Hackborn
40eca65f1a
Merge "Work on issue #74404949 : Screen state usage API" into pi-dev am: 00f3c4333e
...
am: 30181d3bc1
2018-03-28 01:04:17 +00:00
Christopher Tate
09f1c5923e
Merge "Regularize some wallpaper APIs" into pi-dev am: 17b6490ce1
...
am: f88a8023d6
2018-03-28 00:46:06 +00:00
Xiangyu/Malcolm Chen
d0846cfb7c
Merge "Clean new TelephonyManager API." into pi-dev
...
am: 2fc8197b4d
2018-03-27 23:44:31 +00:00
Dianne Hackborn
30181d3bc1
Merge "Work on issue #74404949 : Screen state usage API" into pi-dev
...
am: 00f3c4333e
2018-03-27 23:37:02 +00:00
Brian Young
1a3d46cdae
Merge "Refactor AddUserAuthArgs for extensibility" into pi-dev
...
am: 56e9c026b3
2018-03-27 23:31:01 +00:00
Christopher Tate
f88a8023d6
Merge "Regularize some wallpaper APIs" into pi-dev
...
am: 17b6490ce1
2018-03-27 23:02:45 +00:00
Xiangyu/Malcolm Chen
2fc8197b4d
Merge "Clean new TelephonyManager API." into pi-dev
2018-03-27 22:42:58 +00:00
Dianne Hackborn
00f3c4333e
Merge "Work on issue #74404949 : Screen state usage API" into pi-dev
2018-03-27 22:40:51 +00:00
TreeHugger Robot
56e9c026b3
Merge "Refactor AddUserAuthArgs for extensibility" into pi-dev
2018-03-27 22:13:37 +00:00
Meng Wang
1d9cd76858
Merge "Revert "Unhide enable_apps carrier config key."" into pi-dev
...
am: 2cc67382c0
2018-03-27 22:06:36 +00:00
TreeHugger Robot
17b6490ce1
Merge "Regularize some wallpaper APIs" into pi-dev
2018-03-27 21:50:31 +00:00
Eino-Ville Talvala
a262051294
Merge "Merge "Camera2: Add distortion correction support" into pi-dev am: 3801d3a7d9" into pi-dev-plus-aosp
...
am: a2b839170f
2018-03-27 21:38:15 +00:00
TreeHugger Robot
2cc67382c0
Merge "Revert "Unhide enable_apps carrier config key."" into pi-dev
2018-03-27 20:58:54 +00:00
Dianne Hackborn
ced54398cc
Work on issue #74404949 : Screen state usage API
...
Add usage stats tracking of screen time. There are two new
events, one for when the device is an interactive state, the
other for when it is non-interactive. Also add a whole new
usage stats API for retrieving aggregated data that is associated
with general events, not particular packages. In this case
it allows you to find the time the device spent interactive
and non-interactive and the count of the transitions in to
each of those states.
Bug: 74404949
Test: atest CtsUsageStatsTestCases:UsageStatsTest\#testInteractiveEvents
Change-Id: Ibe6d55e2aecb0c8519b1358644378ec5c7a4250d
2018-03-27 13:27:20 -07:00
Eino-Ville Talvala
4cc8a501f5
Merge "Camera2: Add distortion correction support" into pi-dev
...
am: 3801d3a7d9
2018-03-27 20:22:00 +00:00
Derek Sollenberger
93e2e97d1b
Merge "Remove deprecated android.graphics.Canvas APIs" into pi-dev am: 812e87ecba
...
am: d32b6e012a
2018-03-27 19:36:37 +00:00
TreeHugger Robot
3801d3a7d9
Merge "Camera2: Add distortion correction support" into pi-dev
2018-03-27 19:26:44 +00:00
Derek Sollenberger
d32b6e012a
Merge "Remove deprecated android.graphics.Canvas APIs" into pi-dev
...
am: 812e87ecba
2018-03-27 18:59:01 +00:00
TreeHugger Robot
6d806a961c
Merge "Add a column for series ID"
2018-03-27 18:50:25 +00:00
TreeHugger Robot
812e87ecba
Merge "Remove deprecated android.graphics.Canvas APIs" into pi-dev
2018-03-27 18:00:29 +00:00
Meng Wang
d5e1af54e3
Revert "Unhide enable_apps carrier config key."
...
This reverts commit 4793b28d3ff47a426206
2018-03-27 17:28:19 +00:00
Meng Wang
f657d36f69
Merge "Revert "Unhide enable_apps carrier config key.""
2018-03-27 17:22:08 +00:00
Shubang
30f236711f
Add a column for series ID
...
This column helps us to group programs of the same series, which is
useful for some featues such as series recording.
Bug: 73342889
Test: make;
Change-Id: Ied25189ef4bbc72109192ec2e6f954d9f8e49f07
2018-03-27 17:08:51 +00:00
Jeff Sharkey
4b565cc5c7
Merge "API council requested tweaks to JobInfo." into pi-dev am: a9975804a2
...
am: 120b8aa395
2018-03-27 16:56:36 +00:00
Jeff Sharkey
120b8aa395
Merge "API council requested tweaks to JobInfo." into pi-dev
...
am: a9975804a2
2018-03-27 16:43:25 +00:00
TreeHugger Robot
a9975804a2
Merge "API council requested tweaks to JobInfo." into pi-dev
2018-03-27 16:25:23 +00:00
Jeff Sharkey
8474ca0246
API council requested tweaks to JobInfo.
...
Split network estimates into separate download/upload values, and
add missing accessor methods.
Test: none
Bug: 74945408, 74032541, 74032817
Change-Id: I4c92b8a867690dc4f048701f13142655c3370958
2018-03-27 08:41:42 -06:00
Derek Sollenberger
7b837616ae
Remove deprecated android.graphics.Canvas APIs
...
Bug: 73777445
Test: compile
Change-Id: Ie68f2fbe3c3be82f3c20529d535875d4cc204b7c
2018-03-27 14:36:50 +00:00
Cassie
279138fc9f
Merge "Move alpha long/short to the base CellIdentity according API Review." into pi-dev am: c2bdecb8c8
...
am: 5999b8fce0
2018-03-27 07:08:31 +00:00
Cassie
5999b8fce0
Merge "Move alpha long/short to the base CellIdentity according API Review." into pi-dev
...
am: c2bdecb8c8
2018-03-27 06:56:19 +00:00
TreeHugger Robot
c2bdecb8c8
Merge "Move alpha long/short to the base CellIdentity according API Review." into pi-dev
2018-03-27 06:40:37 +00:00
Ruchi Kandoi
11842e0bba
Merge "Modify Open Mobile API to follow Android API guidelines" am: ee63876ed4 am: 2fa5be61cb
...
am: b126fbb86a
2018-03-27 06:23:25 +00:00
Ruchi Kandoi
b126fbb86a
Merge "Modify Open Mobile API to follow Android API guidelines" am: ee63876ed4
...
am: 2fa5be61cb
2018-03-27 06:09:49 +00:00
Jeff Sharkey
b5bbf4b2c3
Merge "API council requested tweaks to TrafficStats." into pi-dev am: 9a6bc76ee8
...
am: efae42a25d
2018-03-27 04:41:54 +00:00
Treehugger Robot
ee63876ed4
Merge "Modify Open Mobile API to follow Android API guidelines"
2018-03-27 04:40:40 +00:00
Jeff Sharkey
549baaa41f
Merge "API council requested tweaks to SystemClock." into pi-dev am: 0bff5a6dfa
...
am: de5b4f3c99
2018-03-27 03:29:15 +00:00
Jeff Sharkey
da47ba1806
Merge "API council requested tweaks to DataUnit." into pi-dev am: b15bcea4d4
...
am: 2b00e5c3fd
2018-03-27 03:01:08 +00:00
TreeHugger Robot
9a6bc76ee8
Merge "API council requested tweaks to TrafficStats." into pi-dev
2018-03-27 02:56:24 +00:00
Christofer Åkersten
a1f04b92a7
Merge "Hide Media*2 APIs" into pi-dev am: 855617501c
...
am: 1cbf0b4c60
2018-03-27 02:43:00 +00:00
TreeHugger Robot
0bff5a6dfa
Merge "API council requested tweaks to SystemClock." into pi-dev
2018-03-27 02:40:24 +00:00
Jeff Sharkey
78232ee54b
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev am: fee443bfab
...
am: 9d81c54bc8
2018-03-27 02:37:11 +00:00
TreeHugger Robot
b15bcea4d4
Merge "API council requested tweaks to DataUnit." into pi-dev
2018-03-27 02:30:25 +00:00
Christofer Åkersten
855617501c
Merge "Hide Media*2 APIs" into pi-dev
2018-03-27 01:46:42 +00:00
TreeHugger Robot
fee443bfab
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev
2018-03-27 01:40:23 +00:00
Treehugger Robot
aa8f09d41a
Merge "Split the DownloadStateCallback class into two"
2018-03-26 23:53:40 +00:00
Ruchi Kandoi
d785fc4f6d
Modify Open Mobile API to follow Android API guidelines
...
- Add @Nullable/@NonNull to input arguments for APIs
- Remove deprecated methods openBasicChannel(aid) and
openLogicalChannel(aid)
- SecureElementListener is converted to a stand-alone interface
- serviceConnected() callback is renamed to onServiceConnected()
Bug: 64994044
Test: Run Cts Test
Change-Id: I503044a26a81dae8befb87fb8e8ac96d19de883b
2018-03-26 23:28:26 +00:00
Philip P. Moltmann
4d5c36a19c
Merge "Make PackageManager#getNamesForUids testable." into pi-dev am: 9360a31f5f
...
am: 895b6a19a6
2018-03-26 23:08:15 +00:00
TreeHugger Robot
9360a31f5f
Merge "Make PackageManager#getNamesForUids testable." into pi-dev
2018-03-26 22:36:45 +00:00
Jason Monk
8cf36dca52
Merge "Security fixup for Slices" into pi-dev am: fc704e2fd7
...
am: fe54f0c260
2018-03-26 22:13:16 +00:00
