Commit Graph

80452 Commits

Author SHA1 Message Date
Andreas Gampe
d3e7126645 Merge "Zygote: Poll with timeout for pid" am: 89d119abe6 am: 6078facf1f
am: 57ba0ddc91

Change-Id: Idac309f0674a33ef9dd3a6769c217568828f8f8d
2017-07-20 05:49:05 +00:00
Andreas Gampe
57ba0ddc91 Merge "Zygote: Poll with timeout for pid" am: 89d119abe6
am: 6078facf1f

Change-Id: I360bf86dbd5ff0c0d3b0fd6bb207692fe1142bd1
2017-07-20 05:42:34 +00:00
Andreas Gampe
6078facf1f Merge "Zygote: Poll with timeout for pid"
am: 89d119abe6

Change-Id: I704192c4a2e1d0509f0f3c19b42945f2c00669ed
2017-07-20 05:36:42 +00:00
Jeff Davidson
10238e562a Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev
am: acdcf37e4b

Change-Id: I10cc2501e38837f816c564716a6d157bc8f57ed6
2017-07-20 04:32:21 +00:00
TreeHugger Robot
acdcf37e4b Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev 2017-07-20 04:24:50 +00:00
Philip Quinn
980808df5a Ping the StatusBar about power key events.
am: c3a503d8fd

Change-Id: I53c473abae0a58216bfa810d2e5df2da294d411d
2017-07-20 04:01:51 +00:00
Philip Quinn
c3a503d8fd Ping the StatusBar about power key events.
Bug: 63183852
Test: runtest systemui

Change-Id: I5d8209396e3e761b404c1071a7004f34c6e6c927
2017-07-20 03:51:51 +00:00
Andreas Gampe
3fbde346ad Zygote: Poll with timeout for pid
Do not use a blocking readInt. Poll for available bytes with a timeout.

(cherry picked from commit cbc4214061)

Bug: 63638768
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: Ib2131c00aa47dd10bb940d8678bbbfb5a0346ad5
2017-07-19 19:45:55 -07:00
Ahmed ElArabawy
fe4ec9e946 Merge "Fix format of subsystem power stats" into oc-dr1-dev
am: 5512504bba

Change-Id: I3f6b818d34a2a54f73a7192d10d462b68d6e6ed0
2017-07-20 02:43:54 +00:00
TreeHugger Robot
5512504bba Merge "Fix format of subsystem power stats" into oc-dr1-dev 2017-07-20 02:37:56 +00:00
Sungsoo Lim
4dec845d52 Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev
am: 7b3bd1d547

Change-Id: I0bf675f16c233b8b0a83f7bf20c9a42e3b76cbbb
2017-07-20 00:25:11 +00:00
TreeHugger Robot
7b3bd1d547 Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev 2017-07-20 00:18:20 +00:00
Jeff Davidson
e05f37e0a6 Revert disabling of eSIM wipes/retains.
This is a revert of change I414a16cde11e76ccc390e7a63a6803f5b402fe78.
As an additional safety latch, we bypass all logic (either wipe or
retain) if the eSIM has never been provisioned. An unprovisioned eSIM
cannot possibly have profiles - indeed, we don't show the "Wipe eSIM"
checkbox in this case - so there's no reason to tell the LPA to retain
them.

Bug: 63693573
Test: TreeHugger + factory reset local test
Change-Id: I1fea50db317388e81823bf1bd0977ffe787a05e0
2017-07-20 00:01:33 +00:00
Selim Cinek
825719bb92 Merge "Reducing bitmap sizes in notifications" into oc-dr1-dev
am: 8ffa981686

Change-Id: I20fbb857570c0e7bb02659b9026b0800d5939bc2
2017-07-19 23:47:16 +00:00
Selim Cinek
8ffa981686 Merge "Reducing bitmap sizes in notifications" into oc-dr1-dev 2017-07-19 23:41:44 +00:00
Ahmed ElArabawy
307edcd9c2 Fix format of subsystem power stats
The Subsystem power stats string in batteryStats dumpsys has an extra
newline that is causing PowerBug to skip the line when parsing the
history information.
Also, the string for subsystem power stats is missing a heading title
and has some redundant text

This commit fixes these format errors so powerbug can read and parse that
line successfully

Bug: 63447034
Test: Manual testing + Read the bugreport by historian and verify output

Change-Id: Idf971823dd5f769e653b4788b00fc025593d0d3d
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
2017-07-19 16:25:46 -07:00
Lucas Dupin
85fa07b831 Merge "Default gradient should be the dark version" into oc-dr1-dev
am: 4dfb200d1b

Change-Id: I72a0674c9a180f65536553e30f80317276073365
2017-07-19 18:48:15 +00:00
TreeHugger Robot
4dfb200d1b Merge "Default gradient should be the dark version" into oc-dr1-dev 2017-07-19 18:40:38 +00:00
Selim Cinek
15733d1f85 Reducing bitmap sizes in notifications
Bitmap sizes could be arbitrary large when they were sent
over to the system. We're now reducing them to reasonable
sizes.s

Also fixed that notification bitmaps were not put into
ashmem anymore since it got lost in a refactor.

Test: code inspection
Bug: 62319200
Merged-In: I87db7656e749666b9eab1f67fd497f155c407e18
Change-Id: I87db7656e749666b9eab1f67fd497f155c407e18
2017-07-19 18:06:09 +00:00
Ricardo Loo
8fef5bf360 Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev am: 8e644a7510
am: 73f94e7896

Change-Id: I5f6181c026d443357226f6b7e5332a754b130476
2017-07-19 04:52:24 +00:00
Ricardo Loo
04b48078e8 Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
am: 8e644a7510

Change-Id: I3d1a700fe2f5061601c8c874317da4f42ad83772
2017-07-19 04:44:53 +00:00
Ricardo Loo
73f94e7896 Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
am: 8e644a7510

Change-Id: Ib12f6abb1cd3bdc4701b13e607288fcaf48ce43e
2017-07-19 04:44:52 +00:00
Ricardo Loo
8e644a7510 Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev 2017-07-19 04:36:42 +00:00
Romain Guy
5a92a6e074 Merge "Put generated/compiled graphics code in getCodeCacheDir()" into oc-dr1-dev
am: e00bcc0fef

Change-Id: I300fa41c30c64f22c47d164f3b6d6d698e34302f
2017-07-19 01:00:13 +00:00
TreeHugger Robot
e00bcc0fef Merge "Put generated/compiled graphics code in getCodeCacheDir()" into oc-dr1-dev 2017-07-19 00:55:42 +00:00
Robert Quattlebaum
4b90b5f884 Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am: 777c408a22 am: 6b0e6946c3
am: dbc78509ae

Change-Id: I017036f8c63ea1e9c1934daad55ef087b3a83012
2017-07-18 23:51:04 +00:00
Robert Quattlebaum
dbc78509ae Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am: 777c408a22
am: 6b0e6946c3

Change-Id: Ia6ceafa40c73589d516ca0d50168ba217b6af2c8
2017-07-18 23:43:46 +00:00
Lorenzo Colitti
6a5fe34edf resolve merge conflicts of a1d67fb38e to stage-aosp-master
am: 8228eb3446

Change-Id: Ic9ba31da8e5281c9dbc8fa7ff56a63956a495b72
2017-07-18 23:37:57 +00:00
Robert Quattlebaum
6b0e6946c3 Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
am: 777c408a22

Change-Id: I3ae9566ca52b9dae87cace18b1e97897eb8de0ad
2017-07-18 23:33:08 +00:00
Christine Franks
6b43433062 Merge "Disable lock screen by default for demo users" into oc-dr1-dev
am: 205585e574

Change-Id: I05eeee1b997916e0f8fa86614aaac3d0e395a35c
2017-07-18 23:30:29 +00:00
Christine Franks
205585e574 Merge "Disable lock screen by default for demo users" into oc-dr1-dev 2017-07-18 23:18:40 +00:00
Treehugger Robot
777c408a22 Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" 2017-07-18 23:09:58 +00:00
Romain Guy
cecbe073bb Put generated/compiled graphics code in getCodeCacheDir()
A refactoring introduced a slight regression that caused compiled
shaders to be cached in the wrong directory.

Bug: 63813783
Test: Manual
Change-Id: I863e584ff1df4cda9242c64afd643a899023ee1c
2017-07-18 22:48:59 +00:00
Lorenzo Colitti
8228eb3446 resolve merge conflicts of a1d67fb38e to stage-aosp-master
Test: make -j64 services
Change-Id: I3955b01189993f3051c608bc5d07a87e4e3b5f0b
Merged-In: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa
2017-07-19 07:35:31 +09:00
Lucas Dupin
11e0e33756 Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev
am: bc907cf9a8

Change-Id: Ib5533fdbcfba36fc1ed82e0089cc681e73a02f05
2017-07-18 20:24:53 +00:00
TreeHugger Robot
bc907cf9a8 Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev 2017-07-18 20:08:58 +00:00
Rob Carr
228571391e Merge "Fix rotation animation selection." into oc-dr1-dev
am: cee8098178

Change-Id: I1f742419b6f25d74a8b2d895155796f0e718da59
2017-07-18 19:39:46 +00:00
Rob Carr
cee8098178 Merge "Fix rotation animation selection." into oc-dr1-dev 2017-07-18 19:31:00 +00:00
Lorenzo Colitti
a1d67fb38e Merge changes from topic 'tether-offload-cherrypick'
* changes:
  Add code to dump OffloadController state.
  Fetch tethering offload stats.
  Allow more than one source of tethering statistics.
2017-07-18 18:45:29 +00:00
Lorenzo Colitti
07f1304cfe Allow more than one source of tethering statistics.
Currently, netd is the only source of tethering statistics.
In order to support multiple sources, define a new
ITetheringStatsProvider interface that can be registered with
NetworkManagmentService. Convert the existing code into the
first ITetheringStatsProvider.

(cherry picked from commit ef7b2a13ce)

Bug: 29337859
Bug: 32163131
Test: builds, boots
Test: tethering stats continue to be collected
Change-Id: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4
Merged-In: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4
2017-07-19 00:54:54 +09:00
Robert Carr
427ba4ff55 Fix rotation animation selection.
The default manifest value needs to be unspecified, not rotate,
as rotate overrides the LayoutParams specified value.

Bug: 63151981
Test: Manual from bug. go/wm-smoke.
Change-Id: I2ad6e3fdd06eeef0166bbe09d07b57cc45ed6e50
2017-07-17 18:37:06 -07:00
Sungsoo Lim
59579ce59d MediaRouter: Introduce and use getFallbackRoute method
Instead of selecting default route, select the fallback route to avoid
making sound via the default route while a BT route is available.

Bug: 63582431
Test: manual
Change-Id: I2cb8fbf6c518294fcec2bf14a5d8175c7302396f
2017-07-17 23:21:34 +00:00
Mark Salyzyn
72c54c5113 Merge "BootReceiver: check console-ramoops-0" am: a09784ac75 am: e7715b35ea
am: be25a82472

Change-Id: I389d8faf7d30b48bfafac17251216346eb9cb713
2017-07-17 22:58:35 +00:00
Mark Salyzyn
be25a82472 Merge "BootReceiver: check console-ramoops-0" am: a09784ac75
am: e7715b35ea

Change-Id: I4ea86cc33247c2b7bf187cc8b2bc5b9c7aadc1f4
2017-07-17 22:46:45 +00:00
Benjamin Miller
eb3926819a Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am: d726ff988c
am: 8322920a7c

Change-Id: I1605d6607d5057566164f03c6f9c87bfa7fa8546
2017-07-17 22:45:39 +00:00
Neil Fuller
34aca9e2c5 Merge "Remove TODOs that are not needed" am: 0f9842304a am: 5c2cfc51c5
am: 444616f4bf

Change-Id: I5f4265d738aa3669a0c7acb8df49b454a3e27f9c
2017-07-17 22:40:28 +00:00
Benjamin Miller
84a4d3de65 Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
am: d726ff988c

Change-Id: I031f226a4324521a8940453c96da870a49767233
2017-07-17 22:39:28 +00:00
Benjamin Miller
8322920a7c Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
am: d726ff988c

Change-Id: I42a62feffca60e8beb75e991ea0b6545a2813233
2017-07-17 22:37:35 +00:00
Mark Salyzyn
e7715b35ea Merge "BootReceiver: check console-ramoops-0"
am: a09784ac75

Change-Id: Ic3af3fd4f768f391740d56bd73c7dcca7698d1de
2017-07-17 22:34:23 +00:00
Neil Fuller
444616f4bf Merge "Remove TODOs that are not needed" am: 0f9842304a
am: 5c2cfc51c5

Change-Id: Ia585380cb88829bf55171092389b77081d941f17
2017-07-17 22:32:38 +00:00