OSDN Git Service
Dianne Hackborn [Thu, 13 Apr 2017 14:48:33 +0000 (14:48 +0000)]
Merge "Debugging issue #
37272284: ActivityManager: SELinux tag not defined" into oc-dev am:
809f4cf121
am:
80cc3154ee
Change-Id: I3d4eb3d0a2922afc1a3ef1a78cc4dae67f103163
Dianne Hackborn [Thu, 13 Apr 2017 14:42:33 +0000 (14:42 +0000)]
Merge "Debugging issue #
37272284: ActivityManager: SELinux tag not defined" into oc-dev
am:
809f4cf121
Change-Id: I56946e9a2868ea232a02fa2c4919d33c9d0647c0
TreeHugger Robot [Thu, 13 Apr 2017 14:32:37 +0000 (14:32 +0000)]
Merge "Debugging issue #
37272284: ActivityManager: SELinux tag not defined" into oc-dev
Hugo Benichi [Thu, 13 Apr 2017 13:59:55 +0000 (13:59 +0000)]
Merge "Revert "Captive portal: rotate fallback urls"" am:
9ea45b6106 am:
4d47eba86a am:
4d47a6a26b
am:
e90070d528
Change-Id: I4c26b3bf4ae6179193768783781aa8fbe0ac92cc
Orion Hodson [Thu, 13 Apr 2017 13:58:18 +0000 (13:58 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()" am:
891cab55d3 am:
0f7294af11 am:
2d5f14e578
am:
c05219d7b3
Change-Id: I5f34ed353c0892d4afadd4869ba7950dc9bd10ca
Hugo Benichi [Thu, 13 Apr 2017 13:52:21 +0000 (13:52 +0000)]
Merge "Revert "Captive portal: rotate fallback urls"" am:
9ea45b6106 am:
4d47eba86a
am:
4d47a6a26b
Change-Id: Ib4dd12ee716fbc06e1fbfbb2e0445836b1e7c475
Orion Hodson [Thu, 13 Apr 2017 13:46:57 +0000 (13:46 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()" am:
891cab55d3 am:
0f7294af11
am:
2d5f14e578
Change-Id: I9b7a384143ec2dfe3ee55d3949843797f1325d7f
Hugo Benichi [Thu, 13 Apr 2017 13:46:32 +0000 (13:46 +0000)]
Merge "Revert "Captive portal: rotate fallback urls"" am:
9ea45b6106
am:
4d47eba86a
Change-Id: Ic2e927bec210f65a0de6face224ce0b8d227b0bc
Orion Hodson [Thu, 13 Apr 2017 13:40:32 +0000 (13:40 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()" am:
891cab55d3
am:
0f7294af11
Change-Id: Ib22190f899dfe6c1440fd70725958f1a767674ae
Hugo Benichi [Thu, 13 Apr 2017 13:40:04 +0000 (13:40 +0000)]
Merge "Revert "Captive portal: rotate fallback urls""
am:
9ea45b6106
Change-Id: Iea6582b4c7f347c24ebccf815256dd7125ab29de
Orion Hodson [Thu, 13 Apr 2017 13:34:27 +0000 (13:34 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()"
am:
891cab55d3
Change-Id: I6406a01c50df40a59e3af5432c1f31309cdb43e5
Seigo Nonaka [Thu, 13 Apr 2017 13:33:28 +0000 (13:33 +0000)]
Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev am:
061db23b79
am:
c0c5763793
Change-Id: Ibe1167effdbe6ae39f10793691e2722900cd7af7
Seigo Nonaka [Thu, 13 Apr 2017 13:27:57 +0000 (13:27 +0000)]
Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev
am:
061db23b79
Change-Id: I7a7d47db8dedd6f75d4884d635cbfcf15949ac43
Hugo Benichi [Thu, 13 Apr 2017 13:25:40 +0000 (13:25 +0000)]
Merge "Revert "Captive portal: rotate fallback urls""
Treehugger Robot [Thu, 13 Apr 2017 13:25:10 +0000 (13:25 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()"
TreeHugger Robot [Thu, 13 Apr 2017 13:22:06 +0000 (13:22 +0000)]
Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev
Tony Mak [Thu, 13 Apr 2017 12:43:49 +0000 (12:43 +0000)]
Merge "Add hidden API startActivityForResultAsUser" into oc-dev am:
bb14fb9acb
am:
76979ccddc
Change-Id: I1f8f2a01bfa5bf8f1995efb85df89098a2ec21ea
Hugo Benichi [Thu, 13 Apr 2017 12:43:49 +0000 (12:43 +0000)]
Revert "Captive portal: rotate fallback urls"
After discussion in the cl we agreed to use "|" as a separator. However String.split() input arg is a regex and not a literal string, so that "|" will actually split the urls characters per characters.
Will revert and resubmit with a comma.
This reverts commit
0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b.
Change-Id: Ifab25e41bec806fbc1d2c13ffd81d4ad91598c89
Tony Mak [Thu, 13 Apr 2017 12:36:35 +0000 (12:36 +0000)]
Merge "Add hidden API startActivityForResultAsUser" into oc-dev
am:
bb14fb9acb
Change-Id: Iad4f51ffb4cdfaef1aeb312f92284cfad309b978
TreeHugger Robot [Thu, 13 Apr 2017 12:13:00 +0000 (12:13 +0000)]
Merge "Add hidden API startActivityForResultAsUser" into oc-dev
Hugo Benichi [Thu, 13 Apr 2017 10:16:23 +0000 (10:16 +0000)]
Merge changes Ia15f77e2,Icaa1f95c am:
c923752929 am:
8e5ebd9261 am:
b98eee1f78
am:
54e288cc6d
Change-Id: I80446a6c334661fb87e1dabc0765e50e39443612
Hugo Benichi [Thu, 13 Apr 2017 10:10:27 +0000 (10:10 +0000)]
Merge changes Ia15f77e2,Icaa1f95c am:
c923752929 am:
8e5ebd9261
am:
b98eee1f78
Change-Id: I124e328fb64b03eac6808865bf02af8d7dd939cc
Hugo Benichi [Thu, 13 Apr 2017 09:40:19 +0000 (09:40 +0000)]
Merge changes Ia15f77e2,Icaa1f95c am:
c923752929
am:
8e5ebd9261
Change-Id: Idf1f5091144d93f88684df50fd38593400b0e23e
Hugo Benichi [Thu, 13 Apr 2017 09:34:22 +0000 (09:34 +0000)]
Merge changes Ia15f77e2,Icaa1f95c
am:
c923752929
Change-Id: I98b29c91c68a63d6ddeffd03a690b7e841c2b5bc
Treehugger Robot [Thu, 13 Apr 2017 09:24:32 +0000 (09:24 +0000)]
Merge changes Ia15f77e2,Icaa1f95c
* changes:
Captive portal: regroup hardcoded http response codes.
Captive portal: rotate fallback urls
Erik Kline [Thu, 13 Apr 2017 08:50:05 +0000 (08:50 +0000)]
Merge "Extract SimChangeListener to its own file" am:
0ef8df6d52 am:
85f5725fb5 am:
270ab2fa7e
am:
152c9cf703
Change-Id: I8fa851793f50a4b4d8cd003790febeb3f2902d06
Erik Kline [Thu, 13 Apr 2017 08:44:51 +0000 (08:44 +0000)]
Merge "Extract SimChangeListener to its own file" am:
0ef8df6d52 am:
85f5725fb5
am:
270ab2fa7e
Change-Id: Ic39902fe33258dad0315a82b46f37582ba968085
Robert Carr [Thu, 13 Apr 2017 08:42:17 +0000 (08:42 +0000)]
Merge "ViewRoot: More surgically fix child-life time." into oc-dev am:
22762b2283
am:
92d7df7455
Change-Id: I1d57123db0dd800ea587f3a709742122089ffed2
Narayan Kamath [Thu, 13 Apr 2017 08:41:19 +0000 (08:41 +0000)]
Merge "Binder: Be forceful about a forceful exit." into oc-dev am:
6780828985
am:
6dd8b1f411
Change-Id: I17b285919cb5feaf9ba3c82c374146733335894a
Erik Kline [Thu, 13 Apr 2017 08:38:44 +0000 (08:38 +0000)]
Merge "Extract SimChangeListener to its own file" am:
0ef8df6d52
am:
85f5725fb5
Change-Id: I51f350937450542d8217da5e3d4a415de6cb7f30
Robert Carr [Thu, 13 Apr 2017 08:34:19 +0000 (08:34 +0000)]
Merge "ViewRoot: More surgically fix child-life time." into oc-dev
am:
22762b2283
Change-Id: I5685e1d7b4747a5e0276158f11de355131fc4dea
Erik Kline [Thu, 13 Apr 2017 08:33:12 +0000 (08:33 +0000)]
Merge "Extract SimChangeListener to its own file"
am:
0ef8df6d52
Change-Id: Ib83aa0acc1cf19c04ed94a198bb8333c7e3a60b8
Narayan Kamath [Thu, 13 Apr 2017 08:28:13 +0000 (08:28 +0000)]
Merge "Binder: Be forceful about a forceful exit." into oc-dev
am:
6780828985
Change-Id: I966efbe35b0fa0416a5057cb9a1df001baa4590d
TreeHugger Robot [Thu, 13 Apr 2017 08:25:05 +0000 (08:25 +0000)]
Merge "ViewRoot: More surgically fix child-life time." into oc-dev
Treehugger Robot [Thu, 13 Apr 2017 08:19:05 +0000 (08:19 +0000)]
Merge "Extract SimChangeListener to its own file"
Narayan Kamath [Thu, 13 Apr 2017 08:16:45 +0000 (08:16 +0000)]
Merge "Binder: Be forceful about a forceful exit." into oc-dev
Tadashi G. Takaoka [Thu, 13 Apr 2017 08:03:37 +0000 (08:03 +0000)]
Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev am:
d280bfea23
am:
6c8c498b5b
Change-Id: I2da5392ab850cdf9053cfd16d216feffe9afada5
Tadashi G. Takaoka [Thu, 13 Apr 2017 07:53:39 +0000 (07:53 +0000)]
Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev
am:
d280bfea23
Change-Id: I08a985e79f695ed43f4b873698424263689bd57d
Hugo Benichi [Mon, 10 Apr 2017 08:08:06 +0000 (17:08 +0900)]
Captive portal: regroup hardcoded http response codes.
This patch regroups various hardcoded http codes into well defined
constants. This reduces risk of errors and makes the captive portal
logic clearer.
This patch also fixes the logging when a captive portal detection
probe fails, to take into account https ssl handshake failures: for
well-behaved portals it is expected that the https probe will fail,
however the error message was written before the introduction of the
https probe and had become ambiguous.
Test: built, flashed, tested manually with various portal networks
Bug:
36532213
Change-Id: Ia15f77e268cb414816fc52f92835289f9a9ce92b
Hugo Benichi [Mon, 10 Apr 2017 08:43:08 +0000 (17:43 +0900)]
Captive portal: rotate fallback urls
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.
Test: built, flashed, tested manually with various portal networks.
Bug:
36532213
Change-Id: Icaa1f95c5914e8840c83ccdf071047358a5b760f
Tadashi G. Takaoka [Thu, 13 Apr 2017 07:41:29 +0000 (07:41 +0000)]
Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev
Robert Carr [Thu, 13 Apr 2017 07:34:22 +0000 (07:34 +0000)]
Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev am:
9d5ac93cc3
am:
b3871981f2
Change-Id: I2b413c9ba1d36fc8f8b3dffedf72331de82a4b40
Robert Carr [Thu, 13 Apr 2017 07:22:01 +0000 (07:22 +0000)]
Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev
am:
9d5ac93cc3
Change-Id: I34c773700cb3dbb73803df1085034c3ac246943d
TreeHugger Robot [Thu, 13 Apr 2017 07:12:51 +0000 (07:12 +0000)]
Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev
Dan Sandler [Thu, 13 Apr 2017 07:10:34 +0000 (07:10 +0000)]
Merge "Minor text fixes." into oc-dev am:
818c408e5d
am:
ba7435fd81
Change-Id: Id5bac5e8654e55d03835bdf5dc660d5985d67cbc
Android Build Merger (Role) [Thu, 13 Apr 2017 07:07:54 +0000 (07:07 +0000)]
Merge "Merge "AAPT2: Generate R.txt" into oc-dev am:
d1a6e6740f am:
cb276fa531"
Adam Lesinski [Thu, 13 Apr 2017 07:07:15 +0000 (07:07 +0000)]
Merge "AAPT2: Generate R.txt" into oc-dev am:
d1a6e6740f
am:
cb276fa531
Change-Id: I199b76e76a9ed5d4e79ec54830060779eb27c548
Android Build Merger (Role) [Thu, 13 Apr 2017 07:06:50 +0000 (07:06 +0000)]
Merge "Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev am:
07d60cce02 am:
49f1db32ef"
Michael Wright [Thu, 13 Apr 2017 07:06:11 +0000 (07:06 +0000)]
Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev am:
07d60cce02
am:
49f1db32ef
Change-Id: If9510872fe549d06a4f2cdef6c96862f5dfd4127
Android Build Merger (Role) [Thu, 13 Apr 2017 07:05:43 +0000 (07:05 +0000)]
Merge "Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev am:
4ad2ebcc90 am:
3395e15204"
TreeHugger Robot [Thu, 13 Apr 2017 07:05:26 +0000 (07:05 +0000)]
Merge "expose visibility of PbapClientProfile. The use case is that the Car head unit will be consuming the data instead of providing it"
Dan Sandler [Thu, 13 Apr 2017 07:05:05 +0000 (07:05 +0000)]
Merge "Minor text fixes." into oc-dev
am:
818c408e5d
Change-Id: I344ae2f6456893defd49d9efe5af8325770bcf83
Adam Lesinski [Thu, 13 Apr 2017 07:04:57 +0000 (07:04 +0000)]
Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev am:
4ad2ebcc90
am:
3395e15204
Change-Id: I983cee532196a5cd9a16fb65a2007a155428256c
TreeHugger Robot [Thu, 13 Apr 2017 07:00:54 +0000 (07:00 +0000)]
Merge "Minor text fixes." into oc-dev
Adam Lesinski [Thu, 13 Apr 2017 06:59:33 +0000 (06:59 +0000)]
Merge "AAPT2: Generate R.txt" into oc-dev
am:
d1a6e6740f
Change-Id: Ib7d580fe143734fe202829dba8363985bc8406b7
Michael Wright [Thu, 13 Apr 2017 06:55:21 +0000 (06:55 +0000)]
Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev
am:
07d60cce02
Change-Id: I84ee1eddc5a2ae67e1da6de5ad84721714bcd79f
Adam Lesinski [Thu, 13 Apr 2017 06:54:21 +0000 (06:54 +0000)]
Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev
am:
4ad2ebcc90
Change-Id: I326ba95cb4a81305588924a3c987754263b68a4c
TreeHugger Robot [Thu, 13 Apr 2017 06:54:18 +0000 (06:54 +0000)]
Merge "AAPT2: Generate R.txt" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 06:48:25 +0000 (06:48 +0000)]
Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev
Chong Zhang [Thu, 13 Apr 2017 06:45:04 +0000 (06:45 +0000)]
Merge changes from topic 'api-review' into oc-dev am:
fd89a95f35
am:
847beba350
Change-Id: I7abb72fe43b565e3fb4b31418192418b686100f9
Chong Zhang [Thu, 13 Apr 2017 06:43:36 +0000 (06:43 +0000)]
MediaCas: address comments for API reviews am:
addc39ec27
am:
e0c465fefa
Change-Id: If87e2cd96df1a14b7b0c9d753af35fb779c2fbae
TreeHugger Robot [Thu, 13 Apr 2017 06:42:48 +0000 (06:42 +0000)]
Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev
Chong Zhang [Thu, 13 Apr 2017 06:34:25 +0000 (06:34 +0000)]
Merge changes from topic 'api-review' into oc-dev
am:
fd89a95f35
Change-Id: I297fcfecc54346ee885916eb2e671497c522001f
Chong Zhang [Thu, 13 Apr 2017 06:32:28 +0000 (06:32 +0000)]
MediaCas: address comments for API reviews
am:
addc39ec27
Change-Id: Ib4bb32cc09d9352bdbc4913dfdfdf1e92c11487f
Erik Kline [Thu, 13 Apr 2017 06:25:02 +0000 (06:25 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns" am:
f854c9034c am:
1303b8b9ca am:
1d3528ba86
am:
23c0170352
Change-Id: I1f99a5fdcf2285a2579610d1eb0a946d21043e3d
TreeHugger Robot [Thu, 13 Apr 2017 06:23:45 +0000 (06:23 +0000)]
Merge changes from topic 'api-review' into oc-dev
* changes:
MediaCas: combine openSession methods
MediaCas: address comments for API reviews
Erik Kline [Thu, 13 Apr 2017 06:18:38 +0000 (06:18 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns" am:
f854c9034c am:
1303b8b9ca
am:
1d3528ba86
Change-Id: Ic9bf0af39fc2f879fb1fa365480f4d6d187a4d79
Erik Kline [Thu, 13 Apr 2017 06:12:30 +0000 (06:12 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns" am:
f854c9034c
am:
1303b8b9ca
Change-Id: I3fb343daa4d1d5f01d5cc99d842574c841970d03
Erik Kline [Thu, 13 Apr 2017 06:00:37 +0000 (06:00 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns"
am:
f854c9034c
Change-Id: Ic9ac3a2b1162524369f19b876e91a234e56fdc37
Lorenzo Colitti [Thu, 13 Apr 2017 05:54:27 +0000 (05:54 +0000)]
Merge "Move some NetworkStats tests to tests/net." am:
ab3901dc8b am:
67401e25c2 am:
997e6b085a
am:
42f7ca684c
Change-Id: I94265917ea58b78c3ee56ee89f99c0af307b7fe2
Treehugger Robot [Thu, 13 Apr 2017 05:49:31 +0000 (05:49 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns"
Lorenzo Colitti [Thu, 13 Apr 2017 05:48:37 +0000 (05:48 +0000)]
Merge "Move some NetworkStats tests to tests/net." am:
ab3901dc8b am:
67401e25c2
am:
997e6b085a
Change-Id: I37c1d362d891ec3b09b00df44aaf233adf355077
Lorenzo Colitti [Thu, 13 Apr 2017 05:37:01 +0000 (05:37 +0000)]
Merge "Move some NetworkStats tests to tests/net." am:
ab3901dc8b
am:
67401e25c2
Change-Id: I732b7dbc6b0d29a79aff727c2357ed6bb9456f6c
Lorenzo Colitti [Thu, 13 Apr 2017 05:29:58 +0000 (05:29 +0000)]
Merge "Move some NetworkStats tests to tests/net."
am:
ab3901dc8b
Change-Id: I68214c14658afbb5c92facb018988d2ed27bc351
Lorenzo Colitti [Thu, 13 Apr 2017 05:18:46 +0000 (05:18 +0000)]
Merge "Move some NetworkStats tests to tests/net."
Daichi Hirono [Thu, 13 Apr 2017 04:47:53 +0000 (04:47 +0000)]
Merge "Use Context#startForegroundService in MTP provider" into oc-dev am:
96907e6553
am:
1737e10334
Change-Id: I9eba75fb2af47cccb2bec9d71adc258bb5296ebd
Daichi Hirono [Thu, 13 Apr 2017 04:42:22 +0000 (04:42 +0000)]
Merge "Use Context#startForegroundService in MTP provider" into oc-dev
am:
96907e6553
Change-Id: Ic121f5ca810d5d92cbe15dca38ef4c33ed8261d3
Robert Carr [Tue, 11 Apr 2017 01:34:33 +0000 (18:34 -0700)]
Stack APPLICATION_MEDIA_OVERLAY windows with relative layering.
See accompanying frameworks/native commit
"SurfaceFlinger: Add parent-less relative layering" for a full explanation.
Test: Manual of bug repro steps. Plus tests for new SurfaceControl functionality included in frameworks/native.
Bug:
36693738
Change-Id: Ic54598117c1f44a206d33f03d0cc463fbef43fcc
TreeHugger Robot [Thu, 13 Apr 2017 04:36:45 +0000 (04:36 +0000)]
Merge "Use Context#startForegroundService in MTP provider" into oc-dev
Fyodor Kupolov [Thu, 13 Apr 2017 04:24:51 +0000 (04:24 +0000)]
Merge "Report app data fixup and prepare timings" into oc-dev am:
1423ea3a45
am:
9f3cf1a692
Change-Id: I81dfcf98097d356e53994ba7ffaf247618349304
Erik Kline [Fri, 7 Apr 2017 06:29:29 +0000 (15:29 +0900)]
Ignore potential SystemProperties errors when setting net.dns
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
33308258
Bug:
36249702
Change-Id: I76ae853ceb61b7b900f36f9c3cd67b2d2284aab0
Fyodor Kupolov [Thu, 13 Apr 2017 04:13:44 +0000 (04:13 +0000)]
Merge "Report app data fixup and prepare timings" into oc-dev
am:
1423ea3a45
Change-Id: I59bead1f8f0dd6a8cafe2ae564f028dd27dda222
TreeHugger Robot [Thu, 13 Apr 2017 04:08:17 +0000 (04:08 +0000)]
Merge "Report app data fixup and prepare timings" into oc-dev
Vladislav Kaznacheev [Thu, 13 Apr 2017 03:57:09 +0000 (03:57 +0000)]
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev am:
0964a2d9fc
am:
2679fe4e95
Change-Id: Ia664d87748f1febf544a5def60802456951dc23e
Vladislav Kaznacheev [Thu, 13 Apr 2017 03:47:25 +0000 (03:47 +0000)]
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
am:
0964a2d9fc
Change-Id: I800980c3c887dd722410b427b7912b254012effc
TreeHugger Robot [Thu, 13 Apr 2017 03:36:23 +0000 (03:36 +0000)]
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
Jocelyn Dang [Thu, 13 Apr 2017 03:08:46 +0000 (03:08 +0000)]
Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev am:
78b3b2308c
am:
ae624f3f0b
Change-Id: Ibae7b4256adfdf9265d68dffbb5189326342471e
Jocelyn Dang [Thu, 13 Apr 2017 02:58:37 +0000 (02:58 +0000)]
Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev
am:
78b3b2308c
Change-Id: Ie7e78b33cc17ef29eba1ecf304ddbd4b40c17074
Jocelyn Dang [Thu, 13 Apr 2017 02:50:48 +0000 (02:50 +0000)]
Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 02:30:10 +0000 (02:30 +0000)]
Merge "Address API review for ProxyFileDescriptorCallback"
Sudheer Shanka [Thu, 13 Apr 2017 02:05:17 +0000 (02:05 +0000)]
Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev am:
67e802dd5e
am:
012ddf15c7
Change-Id: Ic491c87920519ac0fc04353f62f02a45dc1ba5fc
Sudheer Shanka [Thu, 13 Apr 2017 01:59:13 +0000 (01:59 +0000)]
Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev
am:
67e802dd5e
Change-Id: I88cacca1d3a576b69dc0aaa6806b6c2901afa696
Sudheer Shanka [Thu, 13 Apr 2017 01:53:28 +0000 (01:53 +0000)]
Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev
Winson Chung [Thu, 13 Apr 2017 01:48:53 +0000 (01:48 +0000)]
Merge "Fix regression when removing task." into oc-dev am:
efbcb0d2cc
am:
67004e209d
Change-Id: I523d86f963a6346edac079abde552e5dff732fb6
Dianne Hackborn [Thu, 13 Apr 2017 01:47:43 +0000 (01:47 +0000)]
Merge "Work on issue #
36427964: SecurityException: Unable to find app..." into oc-dev am:
c62f0d7495
am:
bea817a712
Change-Id: I58010d9417177fed45d01a5c9498aa38cc3c2566
Winson Chung [Thu, 13 Apr 2017 01:39:01 +0000 (01:39 +0000)]
Merge "Fix regression when removing task." into oc-dev
am:
efbcb0d2cc
Change-Id: I0f20de44ecbfab8a411e99623f407a4b7c6c6986
Dianne Hackborn [Thu, 13 Apr 2017 01:38:01 +0000 (01:38 +0000)]
Merge "Work on issue #
36427964: SecurityException: Unable to find app..." into oc-dev
am:
c62f0d7495
Change-Id: I87cbbdef2014cdc914b5165e68428aab2fa436c7
TreeHugger Robot [Thu, 13 Apr 2017 01:29:27 +0000 (01:29 +0000)]
Merge "Fix regression when removing task." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 01:27:50 +0000 (01:27 +0000)]
Merge "Work on issue #
36427964: SecurityException: Unable to find app..." into oc-dev
Salvador Martinez [Thu, 13 Apr 2017 01:11:25 +0000 (01:11 +0000)]
Merge "Added strings for thermal shutdown warning" into oc-dev am:
dc52fd3168
am:
37393f92f3
Change-Id: I1e0c5aa83f7e12a864c607264957a7a985251866
OSDN Git Service
