Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,075 Commits 3 Branches 0 Tags
bcbed91c2fd96fbe96c8d2633c0c6ecb4e2df481
Commit Graph

255075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tadashi G. Takaoka
f9952084d4 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am: 8fa8da727b am: 9ef783599b am: 8310560c62 -s ours am: a53a42f049 
am: beb643c169

Change-Id: I2190e307dae81239579b06baa6f271699320d776
 2016-09-18 13:01:23 +00:00
Tadashi G. Takaoka
7662370f49 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am: 5fa097311c -s ours am: 233e3b22f9 am: c296565749 am: dd583cf069 -s ours 
am: 2e0a30efd9

Change-Id: I0fa0e8796310aeec561e4baf33da4fc0145e9c34
 2016-09-18 12:54:49 +00:00
Tadashi G. Takaoka
c8334a8844 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: c6fc6c3b55 -s ours am: 076f262197 am: 3b06511a95 am: 61d39b340a -s ours 
am: ee518e410b

Change-Id: I178dd732ef1b77e4235db277830b2959e8de7831
 2016-09-18 12:51:27 +00:00
Tadashi G. Takaoka
f072cb02dc DO NOT MERGE: Catch all exceptions when parsing IME meta data am: 7bb4c82558 am: 0cf8a60b3f am: 985557ce05 am: 5e3168efe2 -s ours 
am: e877c15076

Change-Id: Iefa7aec0c21e2c8b1b571d8d0042a587afb58fb3
 2016-09-18 12:50:46 +00:00
Tadashi G. Takaoka
beb643c169 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am: 8fa8da727b am: 9ef783599b am: 8310560c62 -s ours 
am: a53a42f049

Change-Id: Id245054a21bd9f029773b5ea2e2663fae836c860
 2016-09-18 12:48:56 +00:00
Tadashi G. Takaoka
bb84821bad DO NOT MERGE: Catch all exceptions when parsing IME meta data am: 43f4980e77 am: cd8595cdcf am: f9dac671ca -s ours am: 9b5fba5f32 
am: d3995603f6

Change-Id: I7c0ef7dd8c0032c6d9f2a7c4e17c3b3d1a7cfbb4
 2016-09-18 12:48:55 +00:00
Tadashi G. Takaoka
fa7eaf692d Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into mnc-dev am: 3a4431bbb9 am: 7e7c15363b am: aecfb81864 
am: 95c8ff2bbc  -s ours

Change-Id: I851a16b9bd461c221537b7eaba7c4b51e258dbb1
 2016-09-18 12:47:52 +00:00
Tadashi G. Takaoka
94537b171c DO NOT MERGE: Catch all exceptions when parsing IME meta data am: f71d2cddf1 am: 57454cf15e am: 29f2e1d93a -s ours 
am: 2578264b86  -s ours

Change-Id: I0f5483480d7ba6c5a5386635fabc0db0bb5aefdb
 2016-09-18 12:47:22 +00:00
Tadashi G. Takaoka
2e0a30efd9 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am: 5fa097311c -s ours am: 233e3b22f9 am: c296565749 
am: dd583cf069  -s ours

Change-Id: I72554dbf5ccc292baf9a6769c0f52a66cc7d33ee
 2016-09-18 12:29:44 +00:00
Tadashi G. Takaoka
e877c15076 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: 7bb4c82558 am: 0cf8a60b3f am: 985557ce05 
am: 5e3168efe2  -s ours

Change-Id: Id00ea6e4418bbe884907a99d761a9979aa364b03
 2016-09-18 12:27:27 +00:00
Tadashi G. Takaoka
95c8ff2bbc Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into mnc-dev am: 3a4431bbb9 am: 7e7c15363b 
am: aecfb81864

Change-Id: I813b9c4879ee86f2dc6e1f3205b8a54f24e913ba
 2016-09-18 12:27:18 +00:00
Tadashi G. Takaoka
d3995603f6 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: 43f4980e77 am: cd8595cdcf am: f9dac671ca -s ours 
am: 9b5fba5f32

Change-Id: Ia9166d55f26c782c9ff1a5b1d2eb25a7d8d4549b
 2016-09-18 12:27:17 +00:00
Tadashi G. Takaoka
ee518e410b DO NOT MERGE: Catch all exceptions when parsing IME meta data am: c6fc6c3b55 -s ours am: 076f262197 am: 3b06511a95 
am: 61d39b340a  -s ours

Change-Id: I8a3cba1aaacab87ac5b2ab00c29c7c52f3c8a55c
 2016-09-18 12:27:12 +00:00
Tadashi G. Takaoka
dd583cf069 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am: 5fa097311c -s ours am: 233e3b22f9 
am: c296565749

Change-Id: I3b97c7b101c53c77f03c889d945d4630edebee44
 2016-09-18 12:23:36 +00:00
Tadashi G. Takaoka
2578264b86 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: f71d2cddf1 am: 57454cf15e 
am: 29f2e1d93a  -s ours

Change-Id: Iaed8d1cc6e6a6bf00a9602ebb829d008f8c4e56e
 2016-09-18 12:22:55 +00:00
Tadashi G. Takaoka
5e3168efe2 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: 7bb4c82558 am: 0cf8a60b3f 
am: 985557ce05

Change-Id: I2069430cc25f652fbf9eb1a45c704cc435b29803
 2016-09-18 12:22:44 +00:00
Tadashi G. Takaoka
a53a42f049 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am: 8fa8da727b am: 9ef783599b 
am: 8310560c62  -s ours

Change-Id: I4091f8ea0cff4720b792d49ee2d5f5cd9c3d3027
 2016-09-18 12:21:50 +00:00
Tadashi G. Takaoka
61d39b340a DO NOT MERGE: Catch all exceptions when parsing IME meta data am: c6fc6c3b55 -s ours am: 076f262197 
am: 3b06511a95

Change-Id: Ia01e63fcf975c21136c0b0206ecd413ec3d975ad
 2016-09-18 12:21:41 +00:00
Tadashi G. Takaoka
aecfb81864 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into mnc-dev am: 3a4431bbb9 
am: 7e7c15363b

Change-Id: I337e4998023537ff7ea88e69b1ad2f82614714da
 2016-09-18 12:18:30 +00:00
Tadashi G. Takaoka
9b5fba5f32 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: 43f4980e77 am: cd8595cdcf 
am: f9dac671ca  -s ours

Change-Id: I252b7a8870a3b161a72e1fd7e0dcc7943e6d08ed
 2016-09-18 12:17:27 +00:00
Tadashi G. Takaoka
29f2e1d93a DO NOT MERGE: Catch all exceptions when parsing IME meta data am: f71d2cddf1 
am: 57454cf15e

Change-Id: I2620580fca624c6ab4520f0a31c42cef42bafa01
 2016-09-18 12:17:17 +00:00
Tadashi G. Takaoka
985557ce05 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: 7bb4c82558 
am: 0cf8a60b3f

Change-Id: I4c019bb037a4d8e0b24f0e627ca59894ed7e38ba
 2016-09-18 12:17:01 +00:00
Tadashi G. Takaoka
8310560c62 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am: 8fa8da727b 
am: 9ef783599b

Change-Id: Idd8e19b941e01ff2de557c569bb06dc0a7bbb6d1
 2016-09-18 12:12:22 +00:00
Tadashi G. Takaoka
c296565749 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am: 5fa097311c -s ours 
am: 233e3b22f9

Change-Id: Iec8b29d93df5e23d80fe9c48f102a6c8d5b4daba
 2016-09-18 12:12:15 +00:00
Tadashi G. Takaoka
f9dac671ca DO NOT MERGE: Catch all exceptions when parsing IME meta data am: 43f4980e77 
am: cd8595cdcf

Change-Id: I27939b464cc8e57a7eba7e03af0f4601fb777ec3
 2016-09-18 12:10:22 +00:00
Tadashi G. Takaoka
3b06511a95 DO NOT MERGE: Catch all exceptions when parsing IME meta data am: c6fc6c3b55 -s ours 
am: 076f262197

Change-Id: Idcd2180c908fb20bfd861c74e07c45c7b2cffed5
 2016-09-18 12:10:03 +00:00
Tadashi G. Takaoka
7e7c15363b Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into mnc-dev 
am: 3a4431bbb9

Change-Id: I7a2ef348e1b198f00c750be3653a2e95cc11df22
 2016-09-18 12:04:07 +00:00
Tadashi G. Takaoka
233e3b22f9 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev 
am: 5fa097311c  -s ours

Change-Id: I4c06dd7ff10cafcf15d0e4ece474c97343f608ae
 2016-09-18 12:04:06 +00:00
Tadashi G. Takaoka
0cf8a60b3f DO NOT MERGE: Catch all exceptions when parsing IME meta data 
am: 7bb4c82558

Change-Id: I78dae55bf202feafe465875b4ddd85ed4827d74d
 2016-09-18 12:04:03 +00:00
Tadashi G. Takaoka
076f262197 DO NOT MERGE: Catch all exceptions when parsing IME meta data 
am: c6fc6c3b55  -s ours

Change-Id: I1433140b2805ca127956f210a3faa81f83dd3069
 2016-09-18 12:04:03 +00:00
Tadashi G. Takaoka
9ef783599b Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev 
am: 8fa8da727b

Change-Id: Ic46e534eebdba8def4e32318aee04601179fc7a9
 2016-09-18 12:04:01 +00:00
Tadashi G. Takaoka
57454cf15e DO NOT MERGE: Catch all exceptions when parsing IME meta data 
am: f71d2cddf1

Change-Id: Iaa5041d4b5fc61860f7ce95ecce60d39bbd5023b
 2016-09-18 12:03:59 +00:00
Tadashi G. Takaoka
cd8595cdcf DO NOT MERGE: Catch all exceptions when parsing IME meta data 
am: 43f4980e77

Change-Id: Ibbf09fdbcaf00fd41d832e3e2597978e2a0863a9
 2016-09-18 12:03:58 +00:00
Tadashi G. Takaoka
3a4431bbb9 Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into mnc-dev 2016-09-18 11:56:25 +00:00
Tadashi G. Takaoka
8fa8da727b Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev 2016-09-18 11:55:57 +00:00
Tadashi G. Takaoka
5fa097311c Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev 2016-09-18 11:55:34 +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
Rebecca Silberstein
bfc76e0646 WifiScanner: retrieve single scan results 
Add a new CMD_GET_SINGLE_SCAN_RESULTS message type and
getSingleScanResults method that allow WifiService to get
scan results directly from WifiScanner.

BUG: 31444878
Test: manually tested on angler
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh on angler
Test: ran GTS CtsNetTestCases on angler
Change-Id: I705233d7dc4ae7e8480c53ff0f9e1b6c8875fecb
 2016-09-17 01:38:33 -07: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
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
Dirk Dougherty
934755b5f3 Merge "Add build target for generating navtree json with all inherited members." into nyc-dev 
am: 3d47dc03db

Change-Id: Id2acb32b2a7f4cbaefd2fa112914985b76c6b6e1
 2016-09-16 23:57:00 +00:00
Dirk Dougherty
e444205930 Add build target for generating navtree json with all inherited members. 
am: 7d47b55cc0

Change-Id: I66a805e871a9501bd5d19587dbc004be0cfd01d0
 2016-09-16 23:56:51 +00:00
Dirk Dougherty
3d47dc03db Merge "Add build target for generating navtree json with all inherited members." into nyc-dev 2016-09-16 23:44:23 +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
Josh Horwich
8960d0a712 Docs: Fix manifest example for ARC 
Simply add "android:" qualifier to required attribute.

Bug: 31554344
Test: None

Change-Id: I13ef9c8614d76bd99f9d7b69d3ea8319843e979a
 2016-09-16 16:12:16 -07:00
Android Build Merger (Role)
2d352ba036 Merge "Merge "WifiScanner: Change hidden/PNO scan params" am: b1161c83f9 am: afef95d3c5" into nyc-dev-plus-aosp 2016-09-16 23:00:23 +00:00
Joe Fernandez
4be99ce745 Merge "docs: Clarification for location permissions and location hardware" into nyc-dev 
am: 5195e8288d

Change-Id: If860aac84f9c3d71ff499eacf5cb059cd50f7e77
 2016-09-16 22:59:10 +00:00
Joe Fernandez
f45304fbdf docs: Clarification for location permissions and location hardware 
am: 1294dde183

Change-Id: Ia22fe839858162a99b852b51b577c69aaa7621c2
 2016-09-16 22:59:02 +00:00