Commit Graph

70169 Commits

Author SHA1 Message Date
Keisuke Kuroyanagi
9123ced2fe Merge "Make ellipsis START and MIDDLE grapheme cluster aware." 2016-09-20 08:06:01 +00:00
Julia Reynolds
3076624ab1 Null check action cloning. am: 53c934cb75 am: f459b5ee8a
am: 775feb1cf7

Change-Id: Ib47c6ed1f1201781771232f5f576a59788e8595f
2016-09-20 06:02:01 +00:00
Eino-Ville Talvala
2ce4b7a8a0 DngCreator: Fix calculation of date/time stamps am: 3fc21ef78b am: 215c76b1f4
am: ba57a47375

Change-Id: I818087e4a3495162eedceaebcd4da93c9eecfe87
2016-09-20 03:04:26 +00:00
yuanhuihui
819698a309 Merge "fix wrong algorithm in WifiPowerPerPacket()" am: 16e1007481 am: b2eb8ea894 am: 731918e769
am: 6ae3c66b92

Change-Id: I947484a629c402bfba65188bc37081471d260c6d
2016-09-20 02:24:16 +00:00
Julia Reynolds
775feb1cf7 Null check action cloning. am: 53c934cb75
am: f459b5ee8a

Change-Id: If1b0516f2d9fa796fa02d2a00451657dbba1ea70
2016-09-20 00:10:17 +00:00
Julia Reynolds
f459b5ee8a Null check action cloning.
am: 53c934cb75

Change-Id: I8cfdd960327c517df28eb7b00a8edac330f6b32f
2016-09-19 22:15:29 +00:00
Tony Mantler
18b7652db7 Merge "Allow styled text in pref titles and summaries" 2016-09-19 21:53:33 +00:00
TreeHugger Robot
c463e06ede Merge changes Idcc4cdd4,I75add6a9,I2aeda867,I1ff912c4
* changes:
  WindowManager: Include sigil in RemoteSurfaceTrace format.
  Pass SurfaceTrace through WM command in binary format.
  Log transaction state to RemoteSurfaceTrace.
  WindowManager RemoteSurfaceTrace infrastructure
2016-09-19 21:32:19 +00:00
Eino-Ville Talvala
ba57a47375 DngCreator: Fix calculation of date/time stamps am: 3fc21ef78b
am: 215c76b1f4

Change-Id: I3b56ec02ba946cc66d62034a8b1ca40d7bc1e9a5
2016-09-19 19:41:40 +00:00
Eino-Ville Talvala
215c76b1f4 DngCreator: Fix calculation of date/time stamps
am: 3fc21ef78b

Change-Id: Ic09cbb9fcf26d4d189506cd1b8c3aaacb86f448d
2016-09-19 19:34:47 +00:00
yuanhuihui
6ae3c66b92 Merge "fix wrong algorithm in WifiPowerPerPacket()" am: 16e1007481 am: b2eb8ea894
am: 731918e769

Change-Id: If8192c5b9976c7139d145da168bcb20ce1fc835c
2016-09-19 18:46:41 +00:00
yuanhuihui
731918e769 Merge "fix wrong algorithm in WifiPowerPerPacket()" am: 16e1007481
am: b2eb8ea894

Change-Id: I5ace39e2b6b679622f9c2ab27831a1e079541e32
2016-09-19 18:40:37 +00:00
yuanhuihui
b2eb8ea894 Merge "fix wrong algorithm in WifiPowerPerPacket()"
am: 16e1007481

Change-Id: I3bacf3deb99b10c5ae8fe22a02ad7066afc321e0
2016-09-19 18:34:42 +00:00
Andrii Kulian
b10330d519 Use Configuration#unset() instead of #setToDefaults() for clearing
Now Configuration.EMPTY has fontScale set to 0 instead of default 1.
To get config equal to empty unset() method should be used.
Because of incorrect usage of setToDefaults() there was a black flash
when exiting split-screen because override config was no completely
empty. Fixing that also allows us to simplify things a bit when checking
if override config changed.

Bug: 31533188
Test: manual - long-press overview to enter split-screen, repeat to exit.
Change-Id: I6bf7994ff88ebb42db2e2357b762857710432a58
2016-09-19 11:34:22 -07:00
Treehugger Robot
16e1007481 Merge "fix wrong algorithm in WifiPowerPerPacket()" 2016-09-19 18:28:47 +00:00
Robert Carr
3b716249cc WindowManager RemoteSurfaceTrace infrastructure
Add "wm surface-trace" command which enables tracing of surface
commands to be switched on at runtime. Primarily intended for use
by WM CTS tests. First target in CTS will be to use show/hide
events to eliminate polling in WM tests and increase speed. Next up
looking at things like verifying various transitions and relaunch
scenarios are flicker free. Later we may want to look at a smarter
or more structured format...but it's really not much hassle to parse
the commands off a pipe so I wanted to get us started.

Test: cts-tradefed run singleCommand cts -o --module CtsWindowManagerHostTestCases --test android.server.cts.SurfaceViewMovementTests#testSurfaceMovesWithParent
Change-Id: I1ff912c405a6cb9996ee9b6e2c465d57706191ba
2016-09-19 11:19:31 -07:00
Eino-Ville Talvala
3fc21ef78b DngCreator: Fix calculation of date/time stamps
Converting the sensor timestamp to date/time requires checking
what the timebase of those timestamps is; getting it wrong will
create drift that increases with device uptime.

Test: android.hardware.camera2.cts.
      DngCreatorTest#testSingleImageThumbnail
Bug: 30125412
Change-Id: Ia5db86012bc9e1c06463b8dc4434d3e063f62cf5
2016-09-18 17:11:41 -07:00
yuanhuihui
9d8f51cbae fix wrong algorithm in WifiPowerPerPacket()
step1: PowerProfile.POWER_WIFI_ACTIVE represents energy consumption(mAh) per hour
devied by 3600, then WIFI_POWER ==> energy consumption(mAh) per second

step2: WIFI_BPS represents 1000000 bit per second
then (double)WIFI_BPS) / 8  ==> 1000000/8 Byte per second

step3: as upload and download, so divided  by 2;
then   (((double)WIFI_BPS) / 8 / 2048))  ==> 1000000/8/2048 KB per second
==> packet  per second (where 1 packet = 2 KB)

so WIFI_POWER / (((double)WIFI_BPS) / 8 / 2048) represents  mAh per Packet where 1 packet = 2 K.

when  divided by (60*60) again , that make WifiPowerEstimator narrow 3600 times.

Change-Id: Ic055a5145b6dfb1129c8969826329a3024c9e2b6
Signed-off-by: yuanhuihui <yuanhuihui@xiaomi.com>
2016-09-18 09:33:39 +08:00
Eino-Ville Talvala
16177b899b Docs: Note that a Surface acts like a weak reference am: c4faf0cb13 am: ca7f4217b8
am: 0b0b740e6a

Change-Id: I173daca517236a9c912518bf2323b4db9a4cf963
2016-09-17 01:03:05 +00:00
Jeff Sharkey
f59e50e781 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296 am: 6495c5ef30
am: ec0933c4bf

Change-Id: I6e50e12ef337ca9519b690951414e1bcc9cade39
2016-09-17 00:50:17 +00:00
Eino-Ville Talvala
0b0b740e6a Docs: Note that a Surface acts like a weak reference am: c4faf0cb13
am: ca7f4217b8

Change-Id: I42b145bb9139058d2ea349dbb556cd8a2f88724b
2016-09-17 00:47:03 +00:00
Android Build Merger (Role)
7c2e30c48f Merge "Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296 am: bd5d0049d7 am: f7caea844f" 2016-09-17 00:46:38 +00:00
Jeff Sharkey
b72e835129 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296 am: bd5d0049d7
am: f7caea844f

Change-Id: Ifa9167a9a69240712a59b90839a32605cfdd7037
2016-09-17 00:46:04 +00:00
TreeHugger Robot
828882a2da Merge "Configuration renaming and minor cleanup in AM and WM" 2016-09-17 00:44:04 +00:00
Jeff Sharkey
f7caea844f Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296
am: bd5d0049d7

Change-Id: Ia9f491892b3b26938dd11f3ed8fc63cc81d37490
2016-09-17 00:35:38 +00:00
Eino-Ville Talvala
ca7f4217b8 Docs: Note that a Surface acts like a weak reference
am: c4faf0cb13

Change-Id: I8466ddcfc3fc99d62dfc842ef84cb0c0663db5e1
2016-09-17 00:35:31 +00:00
Jeff Sharkey
ec0933c4bf Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296
am: 6495c5ef30

Change-Id: I0e5463ab40cbea425badf360388d316a50299dd0
2016-09-17 00:34:52 +00:00
Jeff Sharkey
bd5d0049d7 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927
am: db901ee296

Change-Id: I9033fb021c68bbfc4a8d706e1e7c059f294f510c
2016-09-17 00:24:10 +00:00
Jeff Sharkey
6495c5ef30 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927
am: db901ee296

Change-Id: I683e1c33b8058a597163aacfc744df339188cd37
2016-09-17 00:23:53 +00:00
Jeff Sharkey
db901ee296 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff
am: 33ada2e927

Change-Id: I9b6d2b6f9101e7e7610f191cd4927d568ae0476a
2016-09-17 00:13:26 +00:00
Jeff Sharkey
33ada2e927 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3
am: fc1c0f9dff

Change-Id: I4c197be781f981af568ae98e1c3358ce8572e39a
2016-09-16 23:40:13 +00:00
Jeff Sharkey
fc1c0f9dff Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8
am: afcd1135c3

Change-Id: I9cbfddb282796b2425a0da76760bde0ebd8336b4
2016-09-16 23:31:45 +00:00
Jeff Sharkey
afcd1135c3 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537
am: df42d732f8

Change-Id: Ib7efd9dacf476d8a717456d8e6fc7ee617483d17
2016-09-16 23:14:51 +00:00
Eino-Ville Talvala
c4faf0cb13 Docs: Note that a Surface acts like a weak reference
This causes frequent programming errors, when developers assume
that holding onto a Surface will keep its associated SurfaceTexture,
ImageReader, etc, also alive.

Bug: 31551063
Test: m offline-sdk-docs, manual viewing of result
Change-Id: I5fb5bb3e3c80c7d5d735417b1697e0fe9a62fc46
2016-09-16 22:58:11 +00:00
Jeff Sharkey
df42d732f8 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537
Change-Id: Ib1a0bbb34edb61666ac5739f0b0eaadbe4c5fe06
2016-09-16 16:57:55 -06:00
Andrii Kulian
8072d11f6a Configuration renaming and minor cleanup in AM and WM
- Configuration members in AM and WM are renamed to
  mGlobalConfiguration.
- Renamed parameters names in some methods to better represent
  their meaning.
- Added and fixed some docs.

Change-Id: Ie51f687fe4c10dbce776435f29d6b853fda50eec
2016-09-16 15:40:30 -07:00
Jeff Sharkey
0a9d537f62 Use "all_downloads" instead of "my_downloads". am: 1547194418 am: f6d7c1ed15
am: 6db572cf00

Change-Id: I687a883d528cc260aad3ee3da5600d3e0542c940
2016-09-16 22:07:27 +00:00
Jeff Sharkey
6db572cf00 Use "all_downloads" instead of "my_downloads". am: 1547194418
am: f6d7c1ed15

Change-Id: Icb352ec7b0e746264a6311b5fba1fc1272b627b0
2016-09-16 21:53:37 +00:00
Jeff Sharkey
f6d7c1ed15 Use "all_downloads" instead of "my_downloads".
am: 1547194418

Change-Id: I6dabba1f82ef1989eb2a52c3c493127a174ff315
2016-09-16 21:48:24 +00:00
Tianjie Xu
f4e9efe9d5 Collect status on uncrypt time cost
am: 492450c88a

Change-Id: I17f7f1f61e132059d1f6eb260db5ad5899b9dea8
2016-09-16 20:58:06 +00:00
Etan Cohen
51a6ca483f reolve merge conflicts of 4e3d827 to nyc-mr1-dev-plus-aosp
Change-Id: Idb6cca34536fdbb94876d5cde0b2309462840da1
2016-09-16 12:40:03 -07:00
Tianjie Xu
492450c88a Collect status on uncrypt time cost
Read and report time cost of uncrypt (in seconds) from last_install.

Bug: 31383361

Change-Id: I283970c33b2a0324f2f51cde328e3e527eff7c58
(cherry picked from commit 3477efce30)
2016-09-16 12:13:49 -07:00
Tianjie Xu
cd15fdfb4f Merge "Collect status on uncrypt time cost" am: bc19e00d35 am: 79d27bdeac am: 1579ce8a1d
am: 4392153753

Change-Id: Ic7ff4b820255d1cd305909ad6b920f9e0a1b5ac9
2016-09-16 18:52:28 +00:00
Lorenzo Colitti
4e3d827695 Give WakeupMessage the ability to transport an object as well.
am: 302c37008f

Change-Id: I06152851a392de80b351f2eb332e31363d916b1d
2016-09-16 18:47:26 +00:00
Etan Cohen
eaf7de888d [NAN] Add transport type for NAN.
am: 305ea28a43

Change-Id: I9e12a30de06481418fa2c322fbeef0ecde75f746
2016-09-16 18:45:49 +00:00
Etan Cohen
e77c8c6486 Merge changes from topic 'undo_do_not_merge' into stage-aosp-master
* changes:
  Give WakeupMessage the ability to transport an object as well.
  [NAN] Add transport type for NAN.
2016-09-16 18:41:36 +00:00
Tianjie Xu
4392153753 Merge "Collect status on uncrypt time cost" am: bc19e00d35 am: 79d27bdeac
am: 1579ce8a1d

Change-Id: I17fe7d518a0bc5876d91373b643dd95779be2c54
2016-09-16 18:40:45 +00:00
Tianjie Xu
1579ce8a1d Merge "Collect status on uncrypt time cost" am: bc19e00d35
am: 79d27bdeac

Change-Id: I64f13dbe40845eecb584c0f45a169e0c948275ab
2016-09-16 18:36:20 +00:00
Tianjie Xu
79d27bdeac Merge "Collect status on uncrypt time cost"
am: bc19e00d35

Change-Id: I867821b7575ee2e45bb86c46222e6cf34971689d
2016-09-16 18:30:38 +00:00
Tianjie Xu
bc19e00d35 Merge "Collect status on uncrypt time cost" 2016-09-16 18:19:23 +00:00