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
592552220b
Merge "Add simple NetdService util class" into nyc-mr1-dev
2016-08-26 01:40:58 +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
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
5d146ccdb8
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
2016-08-26 00:10:15 +00:00
Sudheer Shanka
1c153c697b
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 am: d57565864b
...
am: c18b88c15d
2016-08-26 00:06:01 +00:00
Sudheer Shanka
2c18f32328
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev am: cca29c7284
...
am: 2ea71d8c64
2016-08-26 00:03:19 +00:00
Sudheer Shanka
c16baae14f
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours am: 02ba5ef875
...
am: 26fa4042e1
2016-08-26 00:03:15 +00:00
Amith Yamasani
710c5ea5a6
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev am: 5f5403def8
...
am: d8ffc6239b
2016-08-26 00:03:12 +00:00
Amith Yamasani
216e40b926
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours am: 4a3caefd6c
...
am: f7259775d8
2016-08-26 00:03:08 +00:00
Sudheer Shanka
148acfcb45
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev am: 555fbf30d2
...
am: 12a668fde8
2016-08-26 00:03:05 +00:00
Sudheer Shanka
c3a6dbd46e
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
2016-08-25 23:58:24 +00:00
Sudheer Shanka
c18b88c15d
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
...
am: d57565864b
2016-08-25 23:58:21 +00:00
Sudheer Shanka
ea35f92f98
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours am: 6a9490f850
...
am: 380d9b9486
2016-08-25 23:56:58 +00:00
Amith Yamasani
af4f11bdf6
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev am: 4ee46e5b99
...
am: fda97bed8d
2016-08-25 23:56:54 +00:00
Amith Yamasani
1c6048e697
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours am: b6cc1acb63
...
am: b6813f24ae
2016-08-25 23:56:51 +00:00
Mark Goldstein
b354b01acf
Merge "docs: Fix typo" into nyc-dev am: 8d660eebad
...
am: e24079f5b2
2016-08-25 23:56:49 +00:00
Mark Goldstein
60a849ab32
docs: Fix typo am: 1c22ae296b
...
am: b348093ec4
2016-08-25 23:56:45 +00:00
Sudheer Shanka
2ea71d8c64
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev
...
am: cca29c7284
2016-08-25 23:49:45 +00:00
Sudheer Shanka
26fa4042e1
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours
...
am: 02ba5ef875
2016-08-25 23:49:42 +00:00
Amith Yamasani
d8ffc6239b
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev
...
am: 5f5403def8
2016-08-25 23:49:30 +00:00
Amith Yamasani
f7259775d8
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours
...
am: 4a3caefd6c
2016-08-25 23:49:28 +00:00
Sudheer Shanka
12a668fde8
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev
...
am: 555fbf30d2
2016-08-25 23:49:16 +00:00
Sudheer Shanka
380d9b9486
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours
...
am: 6a9490f850
2016-08-25 23:49:14 +00:00
Amith Yamasani
fda97bed8d
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev
...
am: 4ee46e5b99
2016-08-25 23:49:03 +00:00
Amith Yamasani
b6813f24ae
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours
...
am: b6cc1acb63
2016-08-25 23:49:01 +00:00
Mark Goldstein
e24079f5b2
Merge "docs: Fix typo" into nyc-dev
...
am: 8d660eebad
2016-08-25 23:48:49 +00:00
Mark Goldstein
b348093ec4
docs: Fix typo
...
am: 1c22ae296b
2016-08-25 23:48:46 +00:00
Android Build Merger (Role)
fea9feb30e
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
2016-08-25 23:41:50 +00:00
Android Build Merger (Role)
cca29c7284
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev
2016-08-25 23:41:41 +00:00
Yohei Yukawa
c2166b87b0
Also Set IME_FLAG_NO_FULLSCREEN to RemoteEditText
...
This is a follow up CL to the previous CL [1], which specified
IME_FLAG_NO_EXTRACT_UI to RemoteEditText.
As discussed in Bug 7412307, specifying IME_FLAG_NO_EXTRACT_UI without
IME_FLAG_NO_FULLSCREEN has been known to cause some unexpected behaviors
across multiple components since at least ICS release.
Until Bug 7412307 is fixed, it would be safer to specify both flags when
we want to disable full-screen extracted UI mode.
[1]: Ibb759a50ade279ad96598b25f99b169bc27a5b72
0558bc5d6a
2016-08-25 16:41:34 -07:00
Android Build Merger (Role)
5f5403def8
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev
2016-08-25 23:41:32 +00:00
Android Build Merger (Role)
555fbf30d2
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev
2016-08-25 23:41:20 +00:00
Android Build Merger (Role)
4ee46e5b99
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev
2016-08-25 23:41:08 +00:00
Mark Goldstein
8d660eebad
Merge "docs: Fix typo" into nyc-dev
2016-08-25 23:40:43 +00:00
Sudheer Shanka
d57565864b
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
2016-08-25 23:39:59 +00:00
