Jason Monk
f498d0d384
Merge "Backup system QS tiles" into nyc-dr1-dev
2016-08-26 13:18:54 +00:00
Jason Monk
baade7573f
Backup system QS tiles
...
Add QS tiles to the backup list. Non-system tiles will get removed
since they won't be installed when restore happens.
Change-Id: Iccf6e773384c45bd4d1f10c21aa8af356b3920d2
Bug: 28782938
2016-08-26 13:15:49 +00:00
Greg Kaiser
5817ce0c13
ContextHubService: Hack in Google vendor value
...
To workaround b/30808791 without changing the NanoApp API,
we make the assumption that if the most significant byte
of our four-byte app ID is a lower-case 'L', then this
is a Google Nanoapp and thus we should use "Googl" for
our vendor ID, and set the most significant four bytes
of our eight byte app ID accordingly.
Bug: 30922112
Change-Id: I155dff58cdda1ef36a68e6d25df1e9059b1252f1
2016-08-25 23:18:16 -07:00
Greg Kaiser
b70ed04911
ContextHubService: Avoid uninitialized handle
...
am: 9d4d881cc5
2016-08-26 05:59:45 +00:00
Greg Kaiser
9d4d881cc5
ContextHubService: Avoid uninitialized handle
...
We avoid ever using uninitialized stack for the value of a handle
which we pass up to the Java layer.
In cleaning up this code a little, we make more explicit a failure
case which already existed: The Context Hub properly loading a
nanoapp, but our Service code failing to set up the infrastructure
to track it. We chose to tell the Java layer we failed in this
case, and more importantly, provide a consistent handle value.
Note that the INVALID_APP_ID is not known by the Java layer, but
it is consistent so future Java code could react to it. At
the very least we will now always have consistent behavior when
this situation happens.
Bug:30795236
Change-Id: Id4eada529aa1b223867a47985ef1d5c1ba346ea3
2016-08-25 21:34:52 -07:00
Greg Kaiser
a0ce60d36f
Merge "NanoAppFilter: Workaround HubId issues" into nyc-mr1-dev
...
am: f8d61675ac
2016-08-26 03:44:50 +00:00
Greg Kaiser
41ef2a038d
NanoAppFilter: Workaround HubId issues
...
am: 3907049080
2016-08-26 03:44:47 +00:00
Greg Kaiser
d06faffad8
Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev
...
am: 18e59f2988
2016-08-26 03:44:43 +00:00
Greg Kaiser
9ea48989ce
ContextHubService: Maintain hub result meaning
...
am: 6d9e7f669a
2016-08-26 03:44:41 +00:00
Greg Kaiser
d5b81eb77d
Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev
...
am: 1e07e392c3
2016-08-26 03:37:15 +00:00
Greg Kaiser
921e7ef350
ContextHubManager: Fix API documentation.
...
am: fac5be2ace
2016-08-26 03:37:12 +00:00
Greg Kaiser
bb4fbb631c
Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev
...
am: 6ef2cee605
2016-08-26 03:37:08 +00:00
Greg Kaiser
c5ab788398
ContextHubService: Fix app query
...
am: 10163d0dd2
2016-08-26 03:37:06 +00:00
Greg Kaiser
ca627a8cc3
ContextHubService: Don't double report app loads
...
am: fe6d4f518a
2016-08-26 03:36:37 +00:00
Greg Kaiser
ddf97f6b1f
ContextHubService: Make app handle size match Java
...
am: f8210797ad
2016-08-26 03:35:52 +00:00
Greg Kaiser
e7a0e1a771
ContextHubService: Update caches on nanoapp unload
...
am: 0d052c9508
2016-08-26 03:34:41 +00:00
Greg Kaiser
f8d61675ac
Merge "NanoAppFilter: Workaround HubId issues" into nyc-mr1-dev
2016-08-26 03:34:39 +00:00
Greg Kaiser
18e59f2988
Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev
2016-08-26 03:34:07 +00:00
Greg Kaiser
1e07e392c3
Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev
2016-08-26 03:30:19 +00:00
Greg Kaiser
6ef2cee605
Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev
...
* changes:
ContextHubService: Fix app query
ContextHubService: Don't double report app loads
ContextHubService: Make app handle size match Java
ContextHubService: Update caches on nanoapp unload
2016-08-26 03:29:21 +00:00
Erik Kline
78540f798d
Merge "Add simple NetdService util class" into nyc-mr1-dev
...
am: 592552220b
2016-08-26 01:45:32 +00:00
Erik Kline
b92c7205dd
Add simple NetdService util class
...
am: c1bc0be161
2016-08-26 01:45:29 +00:00
Erik Kline
592552220b
Merge "Add simple NetdService util class" into nyc-mr1-dev
2016-08-26 01:40:58 +00:00
Mark Lu
d6cfb23841
Merge "Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am: 314d995ca1 am: b3ab8337df" into nyc-mr1-dev
...
am: 000289bc6c
2016-08-26 01:12:19 +00:00
Mark Lu
3e0f9837f3
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am: 314d995ca1 am: b3ab8337df
...
am: 4b492cbf09
2016-08-26 01:12:17 +00:00
Mark Lu
426a9411a2
Merge "docs: Fix typo and broken link in AsyncTask.java am: 53415ff24e am: bae52ec98c" into nyc-mr1-dev
...
am: 6be20ff728
2016-08-26 01:12:11 +00:00
Mark Lu
b48098f836
docs: Fix typo and broken link in AsyncTask.java am: 53415ff24e am: bae52ec98c
...
am: 86caa4aebf
2016-08-26 01:12:09 +00:00
Winson Chung
ba4744bc08
Merge "Fixing typo in dump log." into nyc-mr1-dev
...
am: 5ebd73f8ff
2016-08-26 01:12:02 +00:00
Winson
1de1a3bfcc
Fixing typo in dump log.
...
am: b43ba86811
2016-08-26 01:12:00 +00:00
Mark Lu
975704a737
Merge "docs: fix link in Loader reference page" into nyc-dev am: 3c638c1ea1 am: ceaef72fb9
...
am: a5f090a768
2016-08-26 01:11:57 +00:00
Mark Lu
bfe0c86461
docs: fix link in Loader reference page am: 9f52b7a4a8 am: f496b9a981
...
am: e16c82d224
2016-08-26 01:11:55 +00:00
Android Build Merger (Role)
000289bc6c
Merge "Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am: 314d995ca1 am: b3ab8337df" into nyc-mr1-dev
2016-08-26 01:05:09 +00:00
Android Build Merger (Role)
6be20ff728
Merge "docs: Fix typo and broken link in AsyncTask.java am: 53415ff24e am: bae52ec98c" into nyc-mr1-dev
2016-08-26 01:04:59 +00:00
Winson Chung
5ebd73f8ff
Merge "Fixing typo in dump log." into nyc-mr1-dev
2016-08-26 01:04:51 +00:00
Mark Lu
4b492cbf09
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am: 314d995ca1
...
am: b3ab8337df
2016-08-26 01:04:01 +00:00
Mark Lu
86caa4aebf
docs: Fix typo and broken link in AsyncTask.java am: 53415ff24e
...
am: bae52ec98c
2016-08-26 01:03:59 +00:00
Mark Lu
a5f090a768
Merge "docs: fix link in Loader reference page" into nyc-dev am: 3c638c1ea1
...
am: ceaef72fb9
2016-08-26 01:03:57 +00:00
Mark Lu
e16c82d224
docs: fix link in Loader reference page am: 9f52b7a4a8
...
am: f496b9a981
2016-08-26 01:03:56 +00:00
Mark Lu
b3ab8337df
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
...
am: 314d995ca1
2016-08-26 00:54:02 +00:00
Mark Lu
bae52ec98c
docs: Fix typo and broken link in AsyncTask.java
...
am: 53415ff24e
2016-08-26 00:53:59 +00:00
Mark Lu
ceaef72fb9
Merge "docs: fix link in Loader reference page" into nyc-dev
...
am: 3c638c1ea1
2016-08-26 00:53:55 +00:00
Mark Lu
f496b9a981
docs: fix link in Loader reference page
...
am: 9f52b7a4a8
2016-08-26 00:53:53 +00:00
Suprabh Shukla
9dbdbf461e
Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev
...
am: 769bc6c8b1
2016-08-26 00:47:30 +00:00
Suprabh Shukla
c9e7c49def
Resolving race condition while writing recent taskids
...
am: fd0bd4f39d
2016-08-26 00:47:27 +00:00
Mark Lu
314d995ca1
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
2016-08-26 00:46:05 +00:00
Mark Lu
3c638c1ea1
Merge "docs: fix link in Loader reference page" into nyc-dev
2016-08-26 00:46:02 +00:00
TreeHugger Robot
769bc6c8b1
Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev
2016-08-26 00:39:45 +00:00
Allen Hair
02fd609460
Configure code coverage filters.
...
Bug: 28269038
Change-Id: If4dfb769d543e70faea7200dc1da15c50a83270f
2016-08-25 17:28:03 -07:00
Fyodor Kupolov
d954357860
Fix AccountManagerServiceTest
...
Unregister AccountManagerInternal before creating a new instance of
AccountManagerService, otherwise it will cause:
java.lang.IllegalStateException: Overriding service registration
Also overrode MockPm.addOnPermissionsChangeListener to be a noop and
not throw an exception.
Bug: 31071079
Change-Id: I0d24232eba655a68bf3fb38d7aa9edb92d469cea
2016-08-26 00:27:05 +00:00
Sudheer Shanka
1167bcf2c9
Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev am: fea9feb30e am: c3a6dbd46e
...
am: 5d146ccdb8
2016-08-26 00:16:36 +00:00
