Commit Graph

252237 Commits

Author SHA1 Message Date
Etan Cohen
88da460cd8 Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" 2016-09-26 18:50:36 +00:00
Etan Cohen
27c18cbb5b [NAN] Replace int peerId with more opaqure Object peerHandle per API review
(cherry-pick of commit f02ae5e23c)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I0225027b8e1a2d7cb5d27afc91b97ef9643f5dff
2016-09-26 10:14:35 -07:00
Etan Cohen
e1513a8cc6 Merge "[NAN] Change Broadcast for NAN status change to notification only" 2016-09-26 16:40:53 +00:00
Etan Cohen
93617997bb [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 905077a590)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: If3d0873989389e6c69feb0d02e5d0c79cdf9679e
2016-09-26 07:53:57 -07:00
Etan Cohen
a7b2fff388 Merge "[NAN] Remove failure reason codes from API per API review" 2016-09-26 14:48:48 +00:00
Treehugger Robot
fe9357f6e7 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
2016-09-26 14:04:57 +00:00
Etan Cohen
5542ccc59c [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 4b47c3f5b8)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: Ibfc9df4dbd3b569caf4ade1da9d2ef43d99269a8
2016-09-26 06:05:06 -07:00
Etan Cohen
1dd012a41a Merge "[NAN] Reorder parameters of send message method(s) per API review" 2016-09-26 12:58:14 +00:00
Treehugger Robot
68e91852c3 Merge "Remove (now) unnecessary reference to core-lambda-stubs." 2016-09-26 09:55:36 +00:00
Etan Cohen
8a66410296 [NAN] Reorder parameters of send message method(s) per API review
Move messageId before message in the argument list.

(cherry-pick of commit 3da7c88425)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I6bfd673a0f92d9908c5b837b713120927b1a0123
2016-09-25 17:19:05 -07:00
Etan Cohen
95abef9355 Merge "[NAN] Add Handler to publish/subscribe per API review" 2016-09-26 00:13:42 +00:00
Dimitry Ivanov
6a7c807d65 Merge "Add missing liblog dependency" 2016-09-24 22:07:37 +00:00
Dimitry Ivanov
1f34a1baeb Add missing liblog dependency
Bug: http://b/31289077
Bug: http://b/27171986
Test: remove liblog from libcutils and recompile
Change-Id: I71f402a04686b7bd6ee6adacda7b51280f5c7b92
2016-09-23 17:20:32 -07:00
Etan Cohen
ede1d0f211 [NAN] Add Handler to publish/subscribe per API review
All callback registrations must have handlers.

(cherry-pick of commit 9b04fd2475)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I5ecc04f997e45b76710f526f378e4cf6e0e28fb9
2016-09-23 10:16:26 -07:00
Treehugger Robot
b05b93a674 Merge "Provide synchronization to setview to avoid NPE" 2016-09-23 12:57:58 +00:00
Etan Cohen
bc3d106b97 Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." 2016-09-23 03:59:40 +00:00
Christopher Wiley
430904a4ab Merge changes from topic 'remove-set-frequency-band'
* changes:
  Remove ability to set frequency from WifiAssociationTest
  Remove WifiManager#get/setFrequencyBand
2016-09-22 23:34:17 +00:00
Treehugger Robot
3b0256fc73 Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind" 2016-09-22 21:56:10 +00:00
Treehugger Robot
ac2d839d7c Merge "aapt: remove duplicate definition of ZD" 2016-09-22 21:24:49 +00:00
Pavlin Radoslavov
74f60c0de8 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
2016-09-22 20:05:22 +00:00
Treehugger Robot
f4c8c3590a Merge "Skip uninstalled package for getPackagesForUid()" 2016-09-22 20:00:01 +00:00
Colin Cross
d333f28397 Merge "Remove has_trivial_move trait from StringPool types" 2016-09-22 19:44:28 +00:00
Colin Cross
cafc05357c 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
2016-09-22 10:09:38 -07:00
liulvping
2527fa3067 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>
2016-09-22 16:53:21 +00:00
Narayan Kamath
2090e9222c Remove (now) unnecessary reference to core-lambda-stubs.
Tis now included in core-oj.

bug: 31675876
Test: make checkbuild
Change-Id: If9062a55ec02fe653542dcb4a41020c8e1f6f15e
2016-09-22 17:52:37 +01:00
Treehugger Robot
1d5447d70b Merge "[ActivityManager] Reset killed flag at attachApplicationLocked" 2016-09-22 14:54:16 +00:00
yuanhuihui
dc94b2973f [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>
2016-09-22 18:17:16 +08:00
Gopal Krishna Shukla
f7abcda5f2 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
2016-09-22 04:48:24 +00:00
Ajay Panicker
2309b98b25 Merge "Remove net_bt_stack group and replace it with bluetooth" 2016-09-22 01:32:33 +00:00
Etan Cohen
78ef40a668 [NAN] Separate ATTACH from IDENTITY_CHANGE callbacks.
Provide separate mechanism to attach with a request for identity
change listener.

(cherry-pick of commit 78e33f277e)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I26b3bf4e904f3c3822578185fa55e2de5e63b71b
2016-09-21 18:11:33 -07:00
Etan Cohen
dcac00f325 Merge "[NAN] Method renames based on API council feedback" 2016-09-22 00:52:48 +00:00
Greg Hackmann
59acc059a6 Merge changes Iaa153fca,I619e2d8a
* changes:
  AlarmManagerService: explain some timerfd_create() failures
  AlarmManagerService: remove legacy /dev/alarm support
2016-09-21 21:04:09 +00:00
Etan Cohen
b68ed2876c [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 34a0342ab5)

Bug: 31470256
Test: unit tests + integration (sl4a) test
Change-Id: I0f275c590c63109b7196622cfc5001082e3eb5a2
2016-09-21 13:46:21 -07:00
Andre Eisenbach
e2d9cc4bc9 Merge "List btopp.intent.action.ACCEPT broadcast as protected" 2016-09-21 20:38:32 +00:00
Chris Tate
73e89cd290 Merge "Fix WallpaperManager APIs" 2016-09-21 20:26:01 +00:00
Etan Cohen
84b3d2040a Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." 2016-09-21 20:14:13 +00:00
Etan Cohen
bd4bf35d22 [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 a2eb21d123)

Bug: 31470256
Test: unit tests, integration (sl4a) tests.
Change-Id: I8be0bc609e55319446cef149ba49cd6f7a5f446a
2016-09-21 10:54:42 -07:00
Jack He
c82a4f4192 List btopp.intent.action.ACCEPT broadcast as protected
Bug: 31604112
Test: manual
Change-Id: Ic5ee837bb895fc5b39b6d1abdd91d8f1d33f62ae
2016-09-21 10:51:47 -07:00
Andre Eisenbach
6eb62f8ee3 Merge "Protect REFRESH_BATCHED_SCAN broadcast" 2016-09-21 17:38:48 +00:00
Ajay Panicker
707b68c426 Protect REFRESH_BATCHED_SCAN broadcast
Bug: 29754520
Test: cherry-pick from internal tree
Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37
(cherry picked from commit 58dd0cd65e)
2016-09-21 17:38:08 +00:00
Neil Fuller
117ef7eb9d Merge "Track API changes associated with AbstractMethod refactoring" 2016-09-21 16:01:56 +00:00
Neil Fuller
3243958460 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
2016-09-21 12:57:41 +01:00
Neil Fuller
0acc91e4fc Merge "Tracking unhiding of java.lang.reflect.Parameter APIs" 2016-09-21 11:45:19 +00:00
Neil Fuller
3ead539c01 Tracking unhiding of java.lang.reflect.Parameter APIs
Bug: 28666126
Change-Id: I37926f8f221dca7e99ffd233a0990fcfa4d56040
2016-09-21 09:21:10 +00:00
Michal Karpinski
1e3f586c10 Merge "Rename the DnsEventListenerService to NetdEventListenerService" 2016-09-21 08:34:39 +00:00
Michal Karpinski
cc6b37d9e2 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
2016-09-21 16:17:26 +09:00
Ajay Panicker
35cb698a88 Remove net_bt_stack group and replace it with bluetooth
Bug: 31549206
Change-Id: I4da37bef5cff0e6054e952e6755905a5cc1e2e68
2016-09-20 23:05:50 +00:00
Christopher Wiley
93ce63760d 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
2016-09-20 15:33:49 -07:00
Christopher Wiley
79ec1736be 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
2016-09-20 15:33:38 -07:00
Greg Hackmann
a0126e0857 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>
2016-09-20 14:33:28 -07:00