Commit Graph

252839 Commits

Author SHA1 Message Date
Amith Yamasani
d09a6aa0f0 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365 am: 5841c492a7 -s ours
am: f705730667

Change-Id: Ib6684a9fc5f6333240690f5b9d5df3643251db03
2016-08-19 18:10:00 +00:00
Greg Kaiser
3be73d3950 ContextHubManager: Document InstanceInfo bug
Our getNanoAppInstanceInfo() method returns incorrect information
for several fields in many cases.  We're too late in the release
cycle to fix the core of this issue, but we can at least document
it so users aren't surprised.

Bug: 30944457
Change-Id: I9330c3b77d08c36befbe20258c6cc45dc640f103
2016-08-19 11:09:01 -07:00
Salvador Martinez
823cd0e35a Prevent wifi icon from disappearing
Made changes to AccessPointPreference to prevent
it from ever setting a empty icon to reduce the
jittering from elements all changing at once.

Bug: 29979747
Change-Id: If432aed1d55b37cf3d48074275f8b3dc0584f884
(cherry picked from commit 45a1594247)
2016-08-19 18:07:00 +00:00
Greg Kaiser
3907049080 NanoAppFilter: Workaround HubId issues
There's no API to set mContextHubId, but testMatch() uses this.

We can't add API at this point of the release cycle, so instead
we default mContextHubId to HUB_ANY, which makes it always match.

Bug:30018518
Change-Id: I4e08afc65889dc109a4da1bd99a027345da865ca
2016-08-19 11:04:32 -07:00
Greg Kaiser
6d9e7f669a ContextHubService: Maintain hub result meaning
We're squeezing a 4-byte signed value to 1-byte.  The naive
(implicit) cast we were using could flip this value from positive
to negative, or vice versa, and completely change the meaning
of the result.

API freeze prevents us from fixing this properly at the moment,
but we use a less naive approach to truncate this value, maintaining
its meaning and logging when we've changed the value.

Bug:30829863
Change-Id: I0e80af9b192066fdf36fee565a4587eb75a5ea7b
2016-08-19 11:02:59 -07:00
Sudheer Shanka
e49de5e073 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 am: 08eb52f9f9
am: 58def3804c  -s ours

Change-Id: I83e7f1e64a965a7550629d2a891445dab11a8d8d
2016-08-19 18:02:26 +00:00
Amith Yamasani
f705730667 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365
am: 5841c492a7  -s ours

Change-Id: Ia483fee611b51ad0187b625c62d32877e73ff551
2016-08-19 18:02:22 +00:00
Greg Kaiser
fac5be2ace ContextHubManager: Fix API documentation.
Most notably, the loadNanoApp() claimed it was returning the
nano app instance handle on success, when it actually was just
returning 0 on success.

Bug: 30475803
Change-Id: I436255f0103a743a02f40c41ee4c6f653d007d89
2016-08-19 11:02:10 -07:00
Sudheer Shanka
03b0f5c3ec Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours
am: f368bdee06

Change-Id: I56d187b0466e674e423754818ba51ca0cdd61a3c
2016-08-19 18:01:17 +00:00
Sudheer Shanka
58def3804c Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5
am: 08eb52f9f9

Change-Id: Ica347f4059b4fbe8f822a963b47df0cbe7c646ba
2016-08-19 17:54:21 +00:00
Amith Yamasani
5841c492a7 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27
am: 39c7879365

Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
2016-08-19 17:54:19 +00:00
Sudheer Shanka
21ef672cab Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev
am: de04301f9a

Change-Id: I1d04889e2227d0a9a6b86b44ce38cdc5763dfac0
2016-08-19 17:46:12 +00:00
Salvador Martinez
2197e8d6f5 Added error handling to settings suggestions list
The suggestions list in the summary page of the
settings app could sometimes cause a crash due to
an uncaught exception. Tis fixed now.

Bug: 30656840
Change-Id: If79f53e6a8c17a81653228d613797e94c473d410
(cherry picked from commit 60d92b3b83)
2016-08-19 17:36:06 +00:00
Sudheer Shanka
08eb52f9f9 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb
am: 7e890c8eb5

Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
2016-08-19 17:32:47 +00:00
Amith Yamasani
39c7879365 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4
am: 29ae7b1a27

Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
2016-08-19 17:32:44 +00:00
Sudheer Shanka
270947f78c DO NOT MERGE: Clean up when recycling a pid with a pending launch
am: a3af5c6207

Change-Id: Ibdd69f2fa346dc31224fa6357718f56aa26ded1d
2016-08-19 17:32:01 +00:00
Greg Kaiser
10163d0dd2 ContextHubService: Fix app query
We now ask for the appId the user requested, instead of asking
for no apps (asking for NANOAPP_VENDOR_ALL_APPS without pairing
it with any vendors results in no apps).

Bug: 30829899
Change-Id: I896af60814d55c7f8cb298c9142212bac5b06995
2016-08-19 10:31:58 -07:00
Amith Yamasani
c8aedeeaf6 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours
am: 9be12f8986

Change-Id: Ie692388b7c4ad6492444347ac128d8cf83dd9e21
2016-08-19 17:31:47 +00:00
Sudheer Shanka
dd0be992c0 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev
am: 5e55214ab7

Change-Id: If6174229b0b6d378b7cf6c5f5618ce70d04c400b
2016-08-19 17:31:43 +00:00
Amith Yamasani
4d7740907e DO NOT MERGE: Clean up when recycling a pid with a pending launch
am: b02862c2cf

Change-Id: Id89010f4bf96a43ef9f97488353fbdf89c6f2931
2016-08-19 17:31:39 +00:00
Greg Kaiser
fe6d4f518a ContextHubService: Don't double report app loads
Our logs would show us loading apps twice, when in reality we
load them once, and then update our caches with the app
version later.

There are other issues around how this code works (for example,
b/30970527), but this is an appropriate approach at this
stage of the release.

Bug: 30836667
Change-Id: I2e2a65bc8a2ef4d1703df0a0586a8ed251607af7
2016-08-19 10:24:07 -07:00
Sudheer Shanka
f1e0a4a60c Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
am: badc5cd942

Change-Id: I185ac4f8a3a7905510e3dbe805aebfbdedec049c
2016-08-19 17:23:07 +00:00
Amith Yamasani
ac9bb3886d DO NOT MERGE: Clean up when recycling a pid with a pending launch
am: 55eacb9441

Change-Id: I30549f0235dafa3dcb97f6207b0eda1a3ec8fbd3
2016-08-19 17:23:04 +00:00
Sudheer Shanka
7e890c8eb5 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
am: b51e98becb

Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
2016-08-19 17:22:29 +00:00
Amith Yamasani
29ae7b1a27 DO NOT MERGE: Clean up when recycling a pid with a pending launch
am: d1eeb5b7b4

Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
2016-08-19 17:22:25 +00:00
Ned Burns
a5b41c88ec DO NOT MERGE Cherry-Pick: Add ViewConfiguration.getScaledScrollFactor()
This value is used to convert ACTION_SCROLL axis values into raw
pixel distances.

CP of ag/1333603 from master to feldspar-dev. New method is @hide and
@SystemApi in this version. In master, it's part of the new public
API, but feldspar will launch before O.

Change-Id: I5ee73ebcd183c43939ae8aa157e88489e05d4760
2016-08-19 13:19:20 -04:00
Sudheer Shanka
f368bdee06 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev
am: 96052ea905  -s ours

Change-Id: I6d7353ed5154dfa3c6d556e4701c8c8e4f66feac
2016-08-19 17:11:30 +00:00
Amith Yamasani
9be12f8986 DO NOT MERGE: Clean up when recycling a pid with a pending launch
am: a92810a189  -s ours

Change-Id: Ic25323f818ee224640686c4e1d6c3b3f62ff828f
2016-08-19 17:11:28 +00:00
Sudheer Shanka
de04301f9a Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev 2016-08-19 17:07:06 +00:00
Sudheer Shanka
5e55214ab7 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev 2016-08-19 17:07:01 +00:00
Sudheer Shanka
96052ea905 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev 2016-08-19 17:06:58 +00:00
Sudheer Shanka
b51e98becb Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev 2016-08-19 17:06:55 +00:00
Sudheer Shanka
badc5cd942 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev 2016-08-19 17:06:49 +00:00
Phil Weaver
c34649411d Dispatch a11y events in separate thread.
Moves the IPCs into a separate thread, where they should affect
jank a lot less.

Bug: 30183085
Change-Id: Ib76159d158e7a867e76cdd5c8ea3a318949fcc5b
2016-08-19 09:22:10 -07:00
Greg Kaiser
f8210797ad ContextHubService: Make app handle size match Java
Our code was sometimes using 'uint32_t' and mostly using 'int'
to represent these custom handles.  It was also passing this
value, as a byte stream, to the Java layer.

In the Java layer, this is an 'int', and thus we change all
of our usages to be 'jint' here.  However, we still pass it
as a byte stream, since we're too late in the release cycle
to change the API.  But now this is at least a consistent
size for the code.

This code still suffers from hub handles being inconsistent
with their types, but we leave that for another bug (b/30958512).

Bug: 30806218
Change-Id: I8d9ae8b9519f399d6723cf96293d84a2f5bd9cce
2016-08-19 09:13:52 -07:00
Greg Kaiser
0d052c9508 ContextHubService: Update caches on nanoapp unload
When we unloaded a nanoapp, we weren't updating the cache of
nanoapp information at the ContextHubServer java layer.  Also,
we were leaking the handle.

We fix both of these by invoking the shared delete_app_instance()
function which properly handles all of this.

Furthermore, we allow delete_app_instance() to accept a nullptr
for the JNIEnv, and fix invalidateNanoApps() so that it won't
crash if it's unable to connect to the JVM.

Note that our Java communication in general here should be
cleaned up, but we're too late in the release cycle for
that, and leave that for b/30961119.

Bug: 30951974, 30968860
Change-Id: Ibb07666a8d54618bddaa3eaf36f9578926eb2b0f
2016-08-19 09:13:52 -07:00
Bill Yi
e35215cec7 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 4ecc9d2db4  -s ours

Change-Id: I17a1beb48aad1e8744ecfab50791267ee972b971
2016-08-19 15:34:56 +00:00
Bill Yi
11d3b2db21 Import translations. DO NOT MERGE
am: 02799d57d7  -s ours

Change-Id: I83188fb11d9ca24d92049d8e4ba33b8d2e08a4d0
2016-08-19 15:34:55 +00:00
TreeHugger Robot
4122130005 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-08-19 15:28:50 +00:00
TreeHugger Robot
4ecc9d2db4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-08-19 15:28:29 +00:00
Tyler Gunn
542511a577 Merge "Add connection events for indicated when a connection is remotely held." into nyc-mr1-dev
am: 9df655a443

Change-Id: Iaa5962749f2c3695c145af84c52a0389a8a0f906
2016-08-19 14:32:21 +00:00
Tyler Gunn
536e3805bb Add connection events for indicated when a connection is remotely held.
am: b5ed860de7

Change-Id: I0ff4ec175ae9c316ba9a31ad225a84248301f252
2016-08-19 14:32:16 +00:00
Tyler Gunn
9df655a443 Merge "Add connection events for indicated when a connection is remotely held." into nyc-mr1-dev 2016-08-19 14:28:08 +00:00
Scott Main
be3e7cf89e Merge "fix redirect for AIDL doc bug: 5967288" into nyc-dev am: 66ffbbfdf9 am: 97d6427ab0
am: c4fb0012e1

Change-Id: I2c313260cb95acc8ef7fc1a416ede9faaf29a938
2016-08-19 13:42:14 +00:00
smain@google.com
af76b974ae fix redirect for AIDL doc bug: 5967288 am: 9ad944f8c9 am: 3872e56f69
am: 97fd094458

Change-Id: I55bd31ed3d9b4ce98058ef2478a38cf511b5b85d
2016-08-19 13:42:12 +00:00
Narayan Kamath
957e52bc40 Merge "Process: Fix communication with zygote." into nyc-dev am: cce8af824a am: b8f0cd0248
am: e3cb8a7db9

Change-Id: Iadb326b237e0ff2e23805d46b0331266d81f52f5
2016-08-19 13:42:09 +00:00
Narayan Kamath
352f745c5d Process: Fix communication with zygote. am: 448be0a622 am: 99f960f7da
am: b060316945

Change-Id: I44662f76bc72770c7c52800933e4423811c76aa9
2016-08-19 13:42:07 +00:00
Scott Main
c4fb0012e1 Merge "fix redirect for AIDL doc bug: 5967288" into nyc-dev am: 66ffbbfdf9
am: 97d6427ab0

Change-Id: Ic8a4e3c86fed503333e6f46d62ad4fd492430547
2016-08-19 13:29:14 +00:00
smain@google.com
97fd094458 fix redirect for AIDL doc bug: 5967288 am: 9ad944f8c9
am: 3872e56f69

Change-Id: I19e1cb6e9f79edb9755afb66cce4a67db9428f7f
2016-08-19 13:29:12 +00:00
Narayan Kamath
e3cb8a7db9 Merge "Process: Fix communication with zygote." into nyc-dev am: cce8af824a
am: b8f0cd0248

Change-Id: I49cd6679da56f5f853c17c741064db88431ded8c
2016-08-19 13:29:10 +00:00