OSDN Git Service
Etan Cohen [Wed, 28 Sep 2016 05:04:06 +0000 (05:04 +0000)]
Merge "[NAN] Use a hidden class for peer ID opaque handle"
Treehugger Robot [Wed, 28 Sep 2016 03:32:56 +0000 (03:32 +0000)]
Merge changes from topic 'libandroid-ndk_headers'
* changes:
Move libjnigraphics to ndk_library.
Migrate libandroid.so to ndk_library.
Etan Cohen [Tue, 27 Sep 2016 16:15:46 +0000 (09:15 -0700)]
[NAN] Use a hidden class for peer ID opaque handle
Results in clearer run-time exception (relatively to using Integer).
(cherry-pick of commit
57db2b3eea5333e5ee144ea29e4a4af02fae7309)
Bug:
31689166
Test: unit-tests + integrated (sl4a).
Change-Id: I79d0e8061204834b9775b02d503cb18fd03ed8c6
Jordan Liu [Tue, 27 Sep 2016 22:19:26 +0000 (22:19 +0000)]
Merge "Add key to CarrierConfig"
Dan Albert [Fri, 23 Sep 2016 23:43:49 +0000 (16:43 -0700)]
Move libjnigraphics to ndk_library.
The headers are already migrated because they're in
frameworks/native/include/android, which was covered when migrating
libandroid.
Test: make native
Bug: http://b/
30465923
Change-Id: I610dc6c613f2a408960088a86629073da38682a0
Dan Albert [Fri, 23 Sep 2016 22:55:49 +0000 (15:55 -0700)]
Migrate libandroid.so to ndk_library.
Test: make native
Bug: http://b/
30465923
Change-Id: I956b5014c4da4dce1ce28da706b9d868eba4cce3
Etan Cohen [Tue, 27 Sep 2016 19:50:43 +0000 (19:50 +0000)]
Merge "[NAN] Rename setTerminateNotificationEnabled per API review"
Etan Cohen [Tue, 27 Sep 2016 16:51:37 +0000 (09:51 -0700)]
[NAN] Rename setTerminateNotificationEnabled per API review
(cherry-pick of commit
7df9b7a1039ea8e34e82e650cebd1025a2591580)
Bug:
31470256
Test: unit tests + integrated (sl4a) tests
Change-Id: I1554b5b7961a5c46656a40ad395431125da7aa7f
Tobias Thierer [Tue, 27 Sep 2016 14:03:44 +0000 (14:03 +0000)]
Merge "API: Update ResourceBundle to OpenJDK8u60"
Treehugger Robot [Tue, 27 Sep 2016 13:18:53 +0000 (13:18 +0000)]
Merge "Implement untetherAll as calls to stopTethering"
Treehugger Robot [Tue, 27 Sep 2016 13:18:37 +0000 (13:18 +0000)]
Merge "Notify NetworkPolicyManagerService on tethering changes"
Etan Cohen [Mon, 26 Sep 2016 22:53:16 +0000 (22:53 +0000)]
Merge "[NAN] Fix javadoc links"
Etan Cohen [Thu, 22 Sep 2016 19:37:17 +0000 (12:37 -0700)]
[NAN] Fix javadoc links
(cherry-pick of commit
ee3d9fc5e60ce4b57dbba7483ac323ed29df2e4a)
Bug:
31470256
Test: builds (javadoc only)
Change-Id: I645525660b9a6759f968d9e62cd79d6a851815bf
Etan Cohen [Mon, 26 Sep 2016 20:48:52 +0000 (20:48 +0000)]
Merge "[NAN] Fix incorrect log message"
Etan Cohen [Thu, 22 Sep 2016 18:00:57 +0000 (11:00 -0700)]
[NAN] Fix incorrect log message
(cherry-pick of commit
0d7863406b1542c3092fa976cfb41b09a97dd8bd)
Bug:
31678708
Test: integrated (sl4a) test
Change-Id: I822c66619642f08d1d8f68cc8257185360da60be
Etan Cohen [Mon, 26 Sep 2016 18:50:35 +0000 (18:50 +0000)]
Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review"
Etan Cohen [Thu, 22 Sep 2016 15:18:36 +0000 (08:18 -0700)]
[NAN] Replace int peerId with more opaqure Object peerHandle per API review
(cherry-pick of commit
f02ae5e23cb59fcbd364907ecb1199424fc5eb62)
Bug:
31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I0225027b8e1a2d7cb5d27afc91b97ef9643f5dff
Etan Cohen [Mon, 26 Sep 2016 16:40:52 +0000 (16:40 +0000)]
Merge "[NAN] Change Broadcast for NAN status change to notification only"
Etan Cohen [Thu, 22 Sep 2016 00:54:35 +0000 (17:54 -0700)]
[NAN] Change Broadcast for NAN status change to notification only
Remove information about current status of NAN. Receiver will have
to query that information explicitly. New pattern (per API council
review) - helps reduce window for having old information.
(cherry-pick of commit
905077a590d5b63a262d6f1f4f6e555ad9b79359)
Bug:
31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: If3d0873989389e6c69feb0d02e5d0c79cdf9679e
Etan Cohen [Mon, 26 Sep 2016 14:48:48 +0000 (14:48 +0000)]
Merge "[NAN] Remove failure reason codes from API per API review"
Treehugger Robot [Mon, 26 Sep 2016 14:04:56 +0000 (14:04 +0000)]
Merge changes from topic 'aosp-generics-api'
* changes:
DO NOT MERGE Track generics in API definition.
DO NOT MERGE Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API
Etan Cohen [Wed, 21 Sep 2016 21:37:02 +0000 (14:37 -0700)]
[NAN] Remove failure reason codes from API per API review
Not all codes are actionable. Will add back if/as needed.
(cherry-pick of commit
4b47c3f5b869a5fb072b122c47bf2c9e87f582e9)
Bug:
31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: Ibfc9df4dbd3b569caf4ade1da9d2ef43d99269a8
Etan Cohen [Mon, 26 Sep 2016 12:58:14 +0000 (12:58 +0000)]
Merge "[NAN] Reorder parameters of send message method(s) per API review"
Treehugger Robot [Mon, 26 Sep 2016 09:55:36 +0000 (09:55 +0000)]
Merge "Remove (now) unnecessary reference to core-lambda-stubs."
Etan Cohen [Wed, 21 Sep 2016 18:53:24 +0000 (11:53 -0700)]
[NAN] Reorder parameters of send message method(s) per API review
Move messageId before message in the argument list.
(cherry-pick of commit
3da7c88425d826e1a5e662f3d8671900e2ad15e5)
Bug:
31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I6bfd673a0f92d9908c5b837b713120927b1a0123
Etan Cohen [Mon, 26 Sep 2016 00:13:42 +0000 (00:13 +0000)]
Merge "[NAN] Add Handler to publish/subscribe per API review"
Dimitry Ivanov [Sat, 24 Sep 2016 22:07:37 +0000 (22:07 +0000)]
Merge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 24 Sep 2016 00:20:32 +0000 (17:20 -0700)]
Add missing liblog dependency
Bug: http://b/
31289077
Bug: http://b/
27171986
Test: remove liblog from libcutils and recompile
Change-Id: I71f402a04686b7bd6ee6adacda7b51280f5c7b92
Etan Cohen [Wed, 21 Sep 2016 18:18:35 +0000 (11:18 -0700)]
[NAN] Add Handler to publish/subscribe per API review
All callback registrations must have handlers.
(cherry-pick of commit
9b04fd2475f5ebecb81e75a8272cf410ba3f5854)
Bug:
31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I5ecc04f997e45b76710f526f378e4cf6e0e28fb9
Treehugger Robot [Fri, 23 Sep 2016 12:57:57 +0000 (12:57 +0000)]
Merge "Provide synchronization to setview to avoid NPE"
Etan Cohen [Fri, 23 Sep 2016 03:59:40 +0000 (03:59 +0000)]
Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."
Christopher Wiley [Thu, 22 Sep 2016 23:34:17 +0000 (23:34 +0000)]
Merge changes from topic 'remove-set-frequency-band'
* changes:
Remove ability to set frequency from WifiAssociationTest
Remove WifiManager#get/setFrequencyBand
Treehugger Robot [Thu, 22 Sep 2016 21:56:09 +0000 (21:56 +0000)]
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
Treehugger Robot [Thu, 22 Sep 2016 21:24:46 +0000 (21:24 +0000)]
Merge "aapt: remove duplicate definition of ZD"
Pavlin Radoslavov [Thu, 22 Sep 2016 00:28:11 +0000 (17:28 -0700)]
Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind
Add a missing call to remove all MESSAGE_BIND_PROFILE_SERVICE
message when unbinding and finishing.
Bug:
31442739
Test: manual, and "frameworks/base/core/tests/bluetoothtests" unit tests
Change-Id: I7e9a8f79a38d4eb8ab8b53be04650226fc72732e
Treehugger Robot [Thu, 22 Sep 2016 20:00:01 +0000 (20:00 +0000)]
Merge "Skip uninstalled package for getPackagesForUid()"
Colin Cross [Thu, 22 Sep 2016 19:44:27 +0000 (19:44 +0000)]
Merge "Remove has_trivial_move trait from StringPool types"
Colin Cross [Thu, 22 Sep 2016 17:09:38 +0000 (10:09 -0700)]
Remove has_trivial_move trait from StringPool types
StringPool:entry* are not trivially moveable, as they contain Vector<>
objects. The data in Vector<> is trivially moveable, but Vector<>
itself is a dynamic type with a vtable, which is not trivially
moveable.
Impact on aapt for frameworks-res is negligible, ~3%.
Bug:
31595853
Test: m -j framework-res
Change-Id: I562a46ef8934aed7aab5c5377db53d9cf64a08b9
liulvping [Mon, 6 Jun 2016 02:20:48 +0000 (10:20 +0800)]
Skip uninstalled package for getPackagesForUid()
If a package with sharedUserId had been setInstalled
with false, then the result of getPackagesForUid()
should not include it.
https://code.google.com/p/android/issues/detail?id=212255
Change-Id: I7b984051db34ecc2d0ef9518786d51100ab9ac79
Signed-off-by: liulvping <liulvping@xiaomi.com>
Narayan Kamath [Thu, 22 Sep 2016 16:50:23 +0000 (17:50 +0100)]
Remove (now) unnecessary reference to core-lambda-stubs.
Tis now included in core-oj.
bug:
31675876
Test: make checkbuild
Change-Id: If9062a55ec02fe653542dcb4a41020c8e1f6f15e
Treehugger Robot [Thu, 22 Sep 2016 14:54:16 +0000 (14:54 +0000)]
Merge "[ActivityManager] Reset killed flag at attachApplicationLocked"
yuanhuihui [Thu, 22 Sep 2016 10:17:16 +0000 (18:17 +0800)]
[ActivityManager] Reset killed flag at attachApplicationLocked
A restarted process will reuse original process record.
If only reset KilledByAm flag, not reset Killed flag.
When app process have been killed by AMS can skip unnessary ANR,
but not catch lowmemorykiller in AppErrors.appNotResponding()
Change-Id: Ie4653edf4252797eaeefbf9a4a35ac00cfa857d8
Signed-off-by: yuanhuihui <yuanhuihui@xiaomi.com>
Gopal Krishna Shukla [Wed, 6 Jul 2016 02:44:59 +0000 (08:14 +0530)]
Provide synchronization to setview to avoid NPE
If setView() will be called from two different threads
then mView property of a View object may have inconsistent
value. For instance, setView() may set mView to null causing
NullPointerException. Synchronize root.setView() as well to
avoid this.
Change-Id: I5f9cf47ece5d4aca575bd8644ecfcee0ed43d843
Ajay Panicker [Thu, 22 Sep 2016 01:32:33 +0000 (01:32 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"
Etan Cohen [Wed, 21 Sep 2016 00:22:35 +0000 (17:22 -0700)]
[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks.
Provide separate mechanism to attach with a request for identity
change listener.
(cherry-pick of commit
78e33f277eff5183f4525ce2a699acf2ad848177)
Bug:
31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I26b3bf4e904f3c3822578185fa55e2de5e63b71b
Etan Cohen [Thu, 22 Sep 2016 00:52:47 +0000 (00:52 +0000)]
Merge "[NAN] Method renames based on API council feedback"
Greg Hackmann [Wed, 21 Sep 2016 21:04:09 +0000 (21:04 +0000)]
Merge changes Iaa153fca,I619e2d8a
* changes:
AlarmManagerService: explain some timerfd_create() failures
AlarmManagerService: remove legacy /dev/alarm support
Etan Cohen [Tue, 20 Sep 2016 16:23:33 +0000 (09:23 -0700)]
[NAN] Method renames based on API council feedback
- Fix tenses throughout
- connect -> attach
- disconnect/terminate -> destroy
- IsUsable -> IsAvailable
Note: pure rename operation - no functional changes
(cherry-pick of commit
34a0342ab515762f3fc594ffbc4784e56e79ccbf)
Bug:
31470256
Test: unit tests + integration (sl4a) test
Change-Id: I0f275c590c63109b7196622cfc5001082e3eb5a2
Andre Eisenbach [Wed, 21 Sep 2016 20:38:31 +0000 (20:38 +0000)]
Merge "List btopp.intent.action.ACCEPT broadcast as protected"
Chris Tate [Wed, 21 Sep 2016 20:26:00 +0000 (20:26 +0000)]
Merge "Fix WallpaperManager APIs"
Etan Cohen [Wed, 21 Sep 2016 20:14:13 +0000 (20:14 +0000)]
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect."
Etan Cohen [Thu, 15 Sep 2016 19:15:10 +0000 (12:15 -0700)]
[NAN] Refactor WifiNanManager to create separate sessions per connect.
Separate session enables separate namespace for functions which depend
on a connection to exist.
(cherry-pick of commit
a2eb21d1233e921487e3dada1d10ba3e14611168)
Bug:
31470256
Test: unit tests, integration (sl4a) tests.
Change-Id: I8be0bc609e55319446cef149ba49cd6f7a5f446a
Jack He [Tue, 20 Sep 2016 23:06:32 +0000 (16:06 -0700)]
List btopp.intent.action.ACCEPT broadcast as protected
Bug:
31604112
Test: manual
Change-Id: Ic5ee837bb895fc5b39b6d1abdd91d8f1d33f62ae
Andre Eisenbach [Wed, 21 Sep 2016 17:38:47 +0000 (17:38 +0000)]
Merge "Protect REFRESH_BATCHED_SCAN broadcast"
Ajay Panicker [Tue, 28 Jun 2016 23:12:37 +0000 (16:12 -0700)]
Protect REFRESH_BATCHED_SCAN broadcast
Bug:
29754520
Test: cherry-pick from internal tree
Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37
(cherry picked from commit
58dd0cd65e7ac9ca0c9ccbf42087baf2df751c61)
Neil Fuller [Wed, 21 Sep 2016 16:01:56 +0000 (16:01 +0000)]
Merge "Track API changes associated with AbstractMethod refactoring"
Neil Fuller [Thu, 8 Sep 2016 11:08:22 +0000 (12:08 +0100)]
Track API changes associated with AbstractMethod refactoring
No actual API change.
Bug:
28666126
Bug:
31052885
Test: make test-art-host and cts run of CtsLibcoreTestCases
Change-Id: I8755509f9b6e5387e071a3550b197167bab6ae04
Neil Fuller [Wed, 21 Sep 2016 11:45:18 +0000 (11:45 +0000)]
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs"
Neil Fuller [Tue, 6 Sep 2016 18:04:18 +0000 (19:04 +0100)]
Tracking unhiding of java.lang.reflect.Parameter APIs
Bug:
28666126
Change-Id: I37926f8f221dca7e99ffd233a0990fcfa4d56040
Michal Karpinski [Wed, 21 Sep 2016 08:34:38 +0000 (08:34 +0000)]
Merge "Rename the DnsEventListenerService to NetdEventListenerService"
Michal Karpinski [Thu, 15 Sep 2016 08:07:08 +0000 (17:07 +0900)]
Rename the DnsEventListenerService to NetdEventListenerService
The service will be extended to include listening for connect events as well.
Test: this is just a renaming change
Bug:
29748723
Change-Id: I4e50e24d1bfb0b5ead4010cc7df3434d38b753d8
Ajay Panicker [Tue, 20 Sep 2016 18:18:14 +0000 (11:18 -0700)]
Remove net_bt_stack group and replace it with bluetooth
Bug:
31549206
Change-Id: I4da37bef5cff0e6054e952e6755905a5cc1e2e68
Christopher Wiley [Tue, 20 Sep 2016 22:33:49 +0000 (15:33 -0700)]
Remove ability to set frequency from WifiAssociationTest
This is no longer a supported API.
Bug:
31148223
Test: This code would no longer compile
Change-Id: I2d8ee6a40eda7e0f1a266cb0579aff2e504f29a7
Christopher Wiley [Mon, 19 Sep 2016 21:09:42 +0000 (14:09 -0700)]
Remove WifiManager#get/setFrequencyBand
These methods are marked @hide and only partially implemented by
the WifiService. In general, it seems wrong to strictly prefer
one WiFi band over another for all WiFi operations. To reduce
implementation complexity, cause setFrequencyBand to become a noop
and getFrequencyBand to reflect the underlying reality, which is
that we will always operate on all supported bands.
Bug:
31148223
Test: Compiles
Change-Id: Iccff517915f7d5ed7e96bf56e4f195b2cda80f0a
Christopher Wiley [Mon, 19 Sep 2016 15:58:06 +0000 (08:58 -0700)]
Implement untetherAll as calls to stopTethering
Calling untether() on an interface name leaves the system
in an inconsistent state, since this is an API for use by
network subsystems to start or stop the tethering of a prepared
downstream network interface. The proper way to disable tethering
is to call stopTethering() with an appropriate technology.
untetherAll() is called in parts of the system UI to disable
all tethering on system state changes (e.g. on the enabling
of data saver).
Bug:
31405407
Test: Enabling data saver now correctly disables tethering
Change-Id: I8e5724a31e015721910a8d278e100daf697c34d7
Christopher Wiley [Fri, 16 Sep 2016 18:14:36 +0000 (11:14 -0700)]
Notify NetworkPolicyManagerService on tethering changes
No longer do this in ConnectivityService#tether/untether.
Instead, have Tethering do it when an interface is actually
tethered.
Bug:
31405407
Test: Toggling hotspot now disables data saver
Change-Id: I9910a2e488c30c92d45f817c8f5df0fac5510de6
Greg Hackmann [Mon, 2 May 2016 20:22:51 +0000 (13:22 -0700)]
AlarmManagerService: explain some timerfd_create() failures
When AlarmManagerService is broken, starting the framework fails in
weird and inconsistent ways. So if we detect your kernel is missing the
required timerfd support, give up immediately and explain why.
Bug:
28357356
Test: manually break timerfd_create syscall, check adb logcat during boot
Change-Id: Iaa153fca38e9cd8e801f3e71c3e1ae2351907828
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Treehugger Robot [Tue, 20 Sep 2016 21:27:54 +0000 (21:27 +0000)]
Merge "Allow WiFi components to manage interface up state"
Treehugger Robot [Tue, 20 Sep 2016 20:28:11 +0000 (20:28 +0000)]
Merge "Removed legacy code used to read/write java arrays from HwBinder parcels."
Greg Hackmann [Mon, 25 Apr 2016 20:30:34 +0000 (13:30 -0700)]
AlarmManagerService: remove legacy /dev/alarm support
We've removed the Android alarm driver from our supported kernels. It's
time to remove the userspace callers too: they make the native side of
AlarmManagerService more complex, and send the wrong signal about
/dev/alarm still being supported.
Bug:
28357356
Test: cts-tradefed run singleCommand cts -d -c android.app.cts.AlarmManagerTest
Change-Id: I619e2d8a98e4c4728131a2d826b1295f858abedd
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Etan Cohen [Tue, 20 Sep 2016 16:41:04 +0000 (16:41 +0000)]
Merge "[NAN] Rename to make discovery explicit"
Rebecca Silberstein [Tue, 20 Sep 2016 15:50:07 +0000 (15:50 +0000)]
Merge "WifiScanner: retrieve single scan results"
Etan Cohen [Wed, 14 Sep 2016 21:41:56 +0000 (14:41 -0700)]
[NAN] Rename to make discovery explicit
Pure rename operation - no other functional changes.
(cherry-pick of commit
ddb5f646562f31d7e78778a978e546f85312b009)
Bug:
31470256
Test: unit tests, integrated (sl4a) tests.
Change-Id: I5110d1a673b7ba4e39350d723b5984586fec585a
Christopher Wiley [Tue, 13 Sep 2016 19:07:58 +0000 (12:07 -0700)]
Allow WiFi components to manage interface up state
Setting the WiFi network interface up or down is racy because it
is not synchronized with the WiFi components managing the interface.
This causes a problem for hostapd when the interface is marked down
before hostapd starts because it causes the driver to enter the
de-initialization process. hostapd does not know how to react to this
change of events.
Bug:
31205821
Test: bug no longer reproduces on upcoming devices, unit tests pass
Change-Id: I96938e2aef89b400593d42ce1b0a6ccc2d2e5754
Andreas Huber [Mon, 19 Sep 2016 19:36:19 +0000 (12:36 -0700)]
Removed legacy code used to read/write java arrays from HwBinder parcels.
More generalized functionality is now available through HwBlob.
Change-Id: Id6c713fb01af7593ea3ff8405f3a9e5325877412
Bug:
31438033
Test: run updated "hidl_test" and "hidl_test_java"
Etan Cohen [Mon, 19 Sep 2016 20:47:36 +0000 (20:47 +0000)]
Merge "[NAN] Update API: replace looper with handler"
Etan Cohen [Fri, 9 Sep 2016 20:36:52 +0000 (13:36 -0700)]
[NAN] Update API: replace looper with handler
Per API council guidelines.
(cherry-pick of commit
0ff5bf0092eb25f579e2e93fb2f93bc953b39211)
Bug:
31377060
Test: unit tests, integrated (sl4a) tests
Change-Id: I05142001fb593399fb4675fbec965d7e08e0fac1
Treehugger Robot [Mon, 19 Sep 2016 20:02:27 +0000 (20:02 +0000)]
Merge "Fix parameter description"
Treehugger Robot [Mon, 19 Sep 2016 18:28:46 +0000 (18:28 +0000)]
Merge "fix wrong algorithm in WifiPowerPerPacket()"
Etan Cohen [Mon, 19 Sep 2016 16:03:59 +0000 (16:03 +0000)]
Merge "[NAN] Make parcelable class final - per API linter"
Etan Cohen [Fri, 9 Sep 2016 23:17:31 +0000 (16:17 -0700)]
[NAN] Make parcelable class final - per API linter
(cherry-pick of
feef60406e961afcda8893c7560382382c358910)
Bug:
31380952
Test: build + sl4a integration test (WifiNanManagerTest:test_nan_discovery_session)
Change-Id: I74c079763d6b3a4f0119b16acd7a18014a10ebbd
yuanhuihui [Mon, 12 Sep 2016 02:34:53 +0000 (10:34 +0800)]
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>
Rebecca Silberstein [Thu, 15 Sep 2016 05:07:04 +0000 (22:07 -0700)]
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
Roshan Pius [Fri, 16 Sep 2016 22:34:57 +0000 (22:34 +0000)]
Merge "WifiScanner: Change hidden/PNO scan params"
Colin Cross [Fri, 16 Sep 2016 19:55:35 +0000 (12:55 -0700)]
aapt: remove duplicate definition of ZD
ZD and ZD_TYPE are set by utils/Compat.h, remove them from
StringPool.cpp and Resource.cpp.
Test: m -j native
Bug:
31492149
Change-Id: I6154e4598dd1f279e348ef6c0b32d756464bda8a
Tianjie Xu [Fri, 16 Sep 2016 18:19:22 +0000 (18:19 +0000)]
Merge "Collect status on uncrypt time cost"
Treehugger Robot [Fri, 16 Sep 2016 18:16:22 +0000 (18:16 +0000)]
Merge "[AM] Skip unnessary ANR when process already died."
Treehugger Robot [Fri, 16 Sep 2016 17:23:41 +0000 (17:23 +0000)]
Merge "Move art::Runtime::InitZygote logic from art into frameworks/base."
Mark Lu [Wed, 23 Mar 2016 11:08:44 +0000 (19:08 +0800)]
[AM] Skip unnessary ANR when process already died.
When app process been killed by AMS or lowmemkiller just before ANR report,
because process record info has been cleared after received death recipient,
it also cannot dump trace log because process already dead,
so report ANR & show ANR UI to let user wait seems is unnecessary.
(compare normal ANR case, if kill app process by command,
ANR dialog will also dismissed, it seems reasonable.)
To check above condition, if ANR process record killed set as true,
it means process already dead & can skip report this ANR.
Change-Id: I483cb02bacb10c32db80ca1097310b02abbac24d
Treehugger Robot [Fri, 16 Sep 2016 08:36:44 +0000 (08:36 +0000)]
Merge "Stop including libcore/include/ in most of frameworks/base."
Treehugger Robot [Fri, 16 Sep 2016 05:21:33 +0000 (05:21 +0000)]
Merge "Remove synchronization from getCurrentInputMethodSubtype()"
Gopal Krishna Shukla [Thu, 30 Jun 2016 06:04:21 +0000 (11:34 +0530)]
Remove synchronization from getCurrentInputMethodSubtype()
getCurrentInputMethodSubtype() acquires InputManagerService.mMethodMap
within its body. There seems to be no reason for holding
InputMethodManager.mH to call getCurrentInputMethodSubtype(). Holding mH
can cause potential deadlock b/w two threads acquiring mH and mMethodMap
in different orders.
Bug:
31247871
Bug:
31273203
Bug: b.android.com/218423
Change-Id: I20cf2c20f49b1b02c0f7a18257b49d4bcc081b5d
Elliott Hughes [Thu, 15 Sep 2016 20:13:39 +0000 (13:13 -0700)]
Stop including libcore/include/ in most of frameworks/base.
frameworks/base/core/jni/android_text_StaticLayout.cpp does actually use
ScopedIcuLocale, so I've left that for now.
Change-Id: I6458cd133871281a747a9da2e304da10b445051a
Jordan Liu [Mon, 12 Sep 2016 17:57:27 +0000 (10:57 -0700)]
Add key to CarrierConfig
Add RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION and default value
(false) to CarrierConfigManager, and remove the old configs.
This value exists because:
http://b/
10131736, requires radio restart.
http://b/
16308209, http://b/
17567651 require that we do not restart.
Merged-In: I4e199d7fe73b82fa39475f31825e5b8ae58d180f
Bug:
29873049
Change-Id: Ie9f8665ff40e2082cf92aa8b4dc337c5ea2ea974
Robert Sesek [Tue, 13 Sep 2016 23:13:01 +0000 (19:13 -0400)]
Move art::Runtime::InitZygote logic from art into frameworks/base.
Test: m
Test: aosp_angler-eng boots
Change-Id: I964c70576136e7424797140b2f7d179e70298c44
Roshan Pius [Mon, 12 Sep 2016 20:46:32 +0000 (13:46 -0700)]
WifiScanner: Change hidden/PNO scan params
Since networks are no longer configured in wpa_supplicant, network
IDs/priorities being passed around for hidden/PNO scanning does not
make any sense.
Changing the wifi scanner interface to remove all network ID/priority
references. These will be replaced by SSID of the corresponding
networks for hidden networks.
BUG:
29503772
TEST: Existing unit tests.
TEST: Successfully connected to a hidden network on device
Change-Id: I5d877e0345d574fb513b6eecca14f65f2ee4e7ab
Treehugger Robot [Wed, 14 Sep 2016 13:54:36 +0000 (13:54 +0000)]
Merge "Skip ANR for processes that have been killed"
Treehugger Robot [Wed, 14 Sep 2016 13:07:05 +0000 (13:07 +0000)]
Merge "app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal."
Narayan Kamath [Tue, 13 Sep 2016 15:19:33 +0000 (16:19 +0100)]
app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal.
Don't make allowances for older kernels. Kernels must handle this
properly since it is now a CTS requirement.
Also remove some unreachable return statements.
Change-Id: I280c4ed5e461d37672236747b5dbb7d1e97ecfec
Treehugger Robot [Tue, 13 Sep 2016 20:57:10 +0000 (20:57 +0000)]
Merge "fix NullPointerException in RegisteredServicesCache"