Commit Graph

6889 Commits

Author SHA1 Message Date
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
Treehugger Robot
16e1007481 Merge "fix wrong algorithm in WifiPowerPerPacket()" 2016-09-19 18:28:47 +00: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
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
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
Robert Sesek
1201509679 Move art::Runtime::InitZygote logic from art into frameworks/base. am: e4f8d69c58 am: c1b32fc3ea
am: 5189f86a36

Change-Id: I495848744c205295d18211c977b64f3a437ec27a
2016-09-16 17:52:50 +00:00
Robert Sesek
5189f86a36 Move art::Runtime::InitZygote logic from art into frameworks/base. am: e4f8d69c58
am: c1b32fc3ea

Change-Id: Ifae90057835b576ca001a141cb56aa4e4f9ba321
2016-09-16 17:41:17 +00:00
Robert Sesek
c1b32fc3ea Move art::Runtime::InitZygote logic from art into frameworks/base.
am: e4f8d69c58

Change-Id: Ia6fdf02ba9d7cd6e473d2891d5b8e59b4e967347
2016-09-16 17:32:49 +00:00
Lorenzo Colitti
302c37008f Give WakeupMessage the ability to transport an object as well.
(cherry-pick of commit eab17da588)
(cherry-pick of commit 4171cdf303)

Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
2016-09-16 10:22:06 -07:00
Michael Kwan
e455850fbd Limit translation of bottom panel snapping to not overshoot.
am: b1440bdb17

Change-Id: I5e34ac21774e9c781f3f3aef0b0a37fe81e1f747
2016-09-15 22:27:52 +00:00
Robert Sesek
e4f8d69c58 Move art::Runtime::InitZygote logic from art into frameworks/base.
Test: m
Test: aosp_angler-eng boots
Change-Id: I964c70576136e7424797140b2f7d179e70298c44
2016-09-14 14:31:12 -04:00
Michael Kwan
b1440bdb17 Limit translation of bottom panel snapping to not overshoot.
Bug: 31444693
Change-Id: I84ff0d90eb67c6672dbf81985057bdf844c50cee
2016-09-12 22:48:34 -07:00
Erik Kline
9a07b75ba2 Have WakeupMessage call Handler#dispatchMessage() am: a457ebbda6
am: 3a28cf3f09

Change-Id: I9faf0c745044cb468c19078409e24b5aacdc0661
2016-09-13 03:38:44 +00:00
Erik Kline
3a28cf3f09 Have WakeupMessage call Handler#dispatchMessage()
am: a457ebbda6

Change-Id: I57ef0f980e4b63735affee6127fffe454e44756f
2016-09-13 03:33:39 +00:00
Svet Ganov
171b77b91e [DO NOT MERGE] Backup account access grants am: 72ed12c55f
am: 0dc4ff0753

Change-Id: Ic6ad395f958b2e09d66467f41bd40e84c34851b9
2016-09-10 00:28:50 +00:00
Svet Ganov
0dc4ff0753 [DO NOT MERGE] Backup account access grants
am: 72ed12c55f

Change-Id: I80029a2db1cbddc22ae545879fd757446610e154
2016-09-10 00:20:52 +00:00
Adam Powell
9415eaf106 Fix duplicate entries in ChooserActivity am: 00e587086b
am: 8469ffdcc1

Change-Id: I64faa05b9892d38e71c8ebb91d02f5302a4be69e
2016-09-09 22:10:24 +00:00
Adam Powell
8469ffdcc1 Fix duplicate entries in ChooserActivity
am: 00e587086b

Change-Id: I3bfed096c104751f80519f72d2d6be1aeacbd109
2016-09-09 21:35:01 +00:00
Adam Powell
00e587086b Fix duplicate entries in ChooserActivity
Fix use of wrong index when checking for duplicates.

Bug 31234526

Change-Id: Ia37d1b04a9054b8d90957057db857633e4b79569
2016-09-09 10:26:35 -07:00
Svet Ganov
72ed12c55f [DO NOT MERGE] Backup account access grants
Sync adapters without an account access cannot run until the
user approves the account access (for the case the account
access is not allowed by other policy such as being singed
with the same cert as the authenticator). If the sync adapter
does not have permission to access the account we ask the
user to grant access and take a note. This CL adds backup
for the explicit user grants.

bug:31162498

Change-Id: I31e3f3d010475352c7c54255ac2d3a2fed4d0c72
2016-09-09 10:16:57 -07:00
Robert Sesek
96b49848e7 Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
There is no functional change. This is to support adding new types of zygotes
that all operate using the same protocol.

Bug: 21643067
(cherry picked from commit 94e824bc1b)

Merged-In: Ie673ee816cae34ac20ffb8c774ec3e6461c3fd0a
Change-Id: I104e6133a90dc93a9854836b5e92d3cd542163a3
2016-09-09 12:42:52 -04:00
Tobias Sargeant
b9679dc1fa Refactor ZygoteInit to support a WebView-specific zygote.
This is a non-functional change that separates out functionality
that should be shared between the system zygote and the WebView
zygote from that which is system zygote specific.

* Move MethodAndArgsCaller to Zygote.
* Split out server socket functions into ZygoteServer.
* Add a new (stub, for now) WebViewZygoteInit class.

Bug: 22084679
Bug: 21643067
(cherry picked from commit ba816e0c9e)

Merged-In: I4c508a42af7ab7b53d10570ad53b846df7782cc4
Change-Id: I54f04c03443d10dabe6426697d1ff8a0cc66b985
2016-09-09 12:42:43 -04:00
Mihai Nita
b6e81a40cd Changed the header of the region selection list to "All regions" am: 543e45babe
am: c3b11eb043

Change-Id: Id5a4ccda29952ae68f1d73c1c063547cc8c827c3
2016-09-08 21:01:02 +00:00
Mihai Nita
c3b11eb043 Changed the header of the region selection list to "All regions"
am: 543e45babe

Change-Id: I7e42e404d7021094376104119f7568fe1838e489
2016-09-08 20:54:43 +00:00
Mihai Nita
543e45babe Changed the header of the region selection list to "All regions"
Bug: 31257462
Change-Id: I3112b5700e23674d2c48c7ca96a2f1a17a5f15db
2016-09-08 11:00:34 -07:00
Paul Duffin
294a6af0e2 Merge "Fix SuppressWarnings typo." am: 0bd7c54745 am: a155f43794
am: 4f107811e2

Change-Id: Ie1f24753f898410aca1270a0d29df06d107fc094
2016-09-08 12:37:35 +00:00
Paul Duffin
4f107811e2 Merge "Fix SuppressWarnings typo." am: 0bd7c54745
am: a155f43794

Change-Id: If228867926149f7cad9b5a479beefc45cacfe7f2
2016-09-08 12:32:31 +00:00
Paul Duffin
a155f43794 Merge "Fix SuppressWarnings typo."
am: 0bd7c54745

Change-Id: I43a9bea860188f55292dcbeac38bf026d87fa634
2016-09-08 12:27:27 +00:00
Ian Rogers
e09ac05b35 Fix SuppressWarnings typo.
As Error Prone states:
Suppressing "deprecated" is probably a typo for "deprecation"
Bug: 27723540

(cherry picked from commit a7f834f1ce)

Change-Id: I0c6a9fc0a160769955cccf97ec7decb1f2b9b8fb
2016-09-08 13:11:37 +01:00
Lorenzo Colitti
4171cdf303 Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
(cherry-pick of commit eab17da588)

Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
2016-09-06 15:54:16 -07:00
Erik Kline
a457ebbda6 Have WakeupMessage call Handler#dispatchMessage()
Handler has no fewer than three ways by which a message might be
handled:

    [1] the msg itself contains a callback (msg.callback.run())

    [2] the Handler was instantiated with a Handler.Callback
        (mCallback.handleMessage(msg))

    [3] the Handler instance was a subclass and could have
        overridden handleMessage()

Handler#dispatchMessage() tries to find the correct way to dispatch
a message, check the above in the above order.

Bug: 21859053
Change-Id: I284cf7ace93af167d95d13b297ec42d4bed15992
2016-09-02 13:03:44 +09:00
Amith Yamasani
65fdd196fa Call Debug.getPss without a lock held am: 10e8f16add
am: f10d31f5d0

Change-Id: I037274eab1841fb57440bbd13a5f290e079736dd
2016-08-31 18:29:35 +00:00
Amith Yamasani
f10d31f5d0 Call Debug.getPss without a lock held
am: 10e8f16add

Change-Id: I8b55ec20fb8cb99941783c88f0a6035e4dcb1e9b
2016-08-31 17:13:57 +00:00
Amith Yamasani
9edadbd87a Merge "Call Debug.getPss without a lock held" into nyc-mr1-dev 2016-08-31 17:09:18 +00:00
Amith Yamasani
10e8f16add Call Debug.getPss without a lock held
Attempt to reduce the chances of watchdog killing the system
server if process pss gathering takes too long during heavy load.

Bug: 30896716
Change-Id: I4ed1a15c0c512a8c82842cde74e733d99d887ee0
2016-08-30 16:39:03 -07:00
Patrick Tjin
7eb4b15e4b BootReceiver: Report correct headers for last messages am: 60c17395a6
am: 56734f96ec

Change-Id: Ieabeda97789d8aabc4e2aecb38ec5bc700061022
2016-08-30 05:31:58 +00:00
Patrick Tjin
56734f96ec BootReceiver: Report correct headers for last messages
am: 60c17395a6

Change-Id: Ib938941dc0cdc066a476964732fc6ce7ee3daac9
2016-08-30 05:22:48 +00:00
Pat Tjin
6c0d81520b Merge "BootReceiver: Report correct headers for last messages" into nyc-mr1-dev 2016-08-30 05:18:35 +00:00
Jorim Jaggi
c5bafe26cb Add animation when unoccluding windows (1/2) am: 6626f54e65
am: 314c05db45

Change-Id: I0e9d85e8f90d00fe835c0622438ac5b6afd2b52d
2016-08-30 02:33:24 +00:00
Mitchell Wills
722de5f9d0 DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp
Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
2016-08-29 17:46:44 -07:00
The Android Automerger
f287780643 Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp 2016-08-30 00:26:21 +00:00
Jorim Jaggi
314c05db45 Add animation when unoccluding windows (1/2)
am: 6626f54e65

Change-Id: I09be1e1b7d830067c354c6cdfd940deafa027a22
2016-08-30 00:25:52 +00:00
Yuichi Biwa
98a824dbb7 ChooserActivity: Cannot start app that the icon overflows the layout
am: cb3e1237b5

Change-Id: I066aa6f03ea3c45fa1330556bc3a6db29ab48262
2016-08-29 22:18:46 +00:00
Abodunrinwa Toki
6507b8b333 FloatingActionMode: Fix screen coordinates.
am: 99c340cad9

Change-Id: I73ff6d1b3bed01d7738634c67a6f6d1a2e755da1
2016-08-29 22:18:07 +00:00
Jorim Jaggi
6626f54e65 Add animation when unoccluding windows (1/2)
Before there was a jump-cut when a window that was occluding Keyguard
was going away, leading to an ugly flicker. To fix this, we do the
following.

- Always show windows with FLAG_SHOW_WHEN_LOCKED above lockscreen, even
if they don't "match" the currently occluding app (which is null in the
animation case)
- Move wallpaper behind last window that is not hidden by policy, so the
window doesn't get occluded by the wallpaper.
- Add a flag in the setOccluded call whether to animate or not. SystemUI
then plays a nice animation when it's set.
- Override the animation to always be the animation that happens when we
exit a window which is revealing the wallpaper behind, to make it
consistent with the home screen case.

Fixes: 30829255
Change-Id: Ib3fe20fc9003a0f9f291c974740f044ed8707e75
2016-08-29 14:15:33 -07:00
Mitchell Wills
07e317c3cd Add Log.wtf when transitionTo is used improperly
Using transitionTo in exit/enter (except in the terminal state) is
documented as undefined behavior and may cause unexpected results.
The current implementation appears to finish the current transition and
then transition to the new target state.

TEST=flash and play with the phone, no sign of immediate WTFs

Change-Id: I38a34b85c43d53c51514339587fc1269a069a454
(cherry picked from commit 8d3ed21583)
2016-08-29 11:26:53 -07:00
Mitchell Wills
009ae99582 Reenable the unit tests for StateMachine
In order to make the tests run a few methods must be made public so that
they can be called from a class loaded by a different class loader.

Fixed: 28217358
Change-Id: I98ce1e952a78528ae6ebd3a0e843c9ddfe937337
(cherry picked from commit 36afe5b5cc)
2016-08-29 11:26:51 -07:00
Rebecca Silberstein
934535bfe5 DO NOT MERGE StateMachine: remove final from SendMessage
Removed final from public sendMessage and sendMessageDelayed commands to
unblock unittest development.  This allows tests to verify calls to
sendMessage and sendMessageDelayed.

Also fixed one checkstyle error with import order.

BUG: 28593024
Change-Id: I26e02c3d75049d385ded7891c4fc9967273c27be
TEST: builds
TEST: runtest frameworks-wifi
(cherry picked from commit 0dbeb9e01a)
2016-08-29 11:26:42 -07:00