Makoto Onuki
|
ce34881b19
|
Add "adb shell content gettype" support
Change-Id: I902d66b5c8ee45411ba6b82dd1b0bb7506d1f117
|
2016-09-02 13:10:49 -07:00 |
|
Adam Lesinski
|
79758c8e77
|
Merge "AAPT2: Fix merging of styleables the right way"
|
2016-08-30 17:49:14 +00:00 |
|
Felipe Leme
|
a08ca06b7b
|
Merge "Moar test cases for NetworkPolicyManagerServiceTest."
|
2016-08-30 17:39:58 +00:00 |
|
Jorim Jaggi
|
994e5909d1
|
Play sound on ACTION_DOWN for navigation keys am: 05bce15da9 am: 9bdfbd7c82
am: 214f2fe7b4
Change-Id: I5cd28d2b4c1d903fa76a8bae0edec93d7d047282
|
2016-08-30 17:20:17 +00:00 |
|
Brian Duddie
|
0a38c9f5df
|
Merge "ContextHubManager: Document InstanceInfo bug" into nyc-mr1-dev am: 73f511e471 am: 3a41c5b654
am: 1e9d0f17cf
Change-Id: Ib91456a530ba5fd8e67ae92046d52fbfe392bbb1
|
2016-08-30 17:20:13 +00:00 |
|
Greg Kaiser
|
ed2a5f8592
|
ContextHubManager: Document InstanceInfo bug am: 3be73d3950 am: 6f155aa4bf
am: 7fd9e40381
Change-Id: I0f95997e013d5cb8fb23b18ad82763cc091e38f1
|
2016-08-30 17:20:09 +00:00 |
|
Paul Stewart
|
1c3d6efc0c
|
Merge "Document correct context for obtaining WifiManager" into nyc-mr1-dev am: 855210170c am: 1377955965
am: 2154beb07e
Change-Id: I9c0fa23c50528802ad22a2a9de0af0b4660b43db
|
2016-08-30 17:20:05 +00:00 |
|
Paul Stewart
|
c4ec49b7b9
|
Document correct context for obtaining WifiManager am: 0e164b199e am: b09557b3cf
am: 163a135246
Change-Id: I943a2d60461633b9432bdf83c3b25086bba22b94
|
2016-08-30 17:20:02 +00:00 |
|
Allen Hair
|
155374e855
|
Merge "Configure code coverage filters." into nyc-mr1-dev am: 6bf296f6dc am: baac84303c
am: 99b8ff8b7d
Change-Id: Ibfe5e6fcd6bb3791b37d13bbc665b54990fb18f3
|
2016-08-30 17:13:10 +00:00 |
|
Allen Hair
|
63180a0754
|
Configure code coverage filters. am: 02fd609460 am: 15b70213a4
am: 8b931e08d0
Change-Id: If94db4d01eb5ff4a9f463200d529b0054899bcd5
|
2016-08-30 17:13:01 +00:00 |
|
Fyodor Kupolov
|
de9fc0f679
|
Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev am: 4be496d2d0 am: 429a0197bf
am: 53fffe11d6
Change-Id: I4148a7c506843d096f26dd177523d33ebeafd7e4
|
2016-08-30 17:12:54 +00:00 |
|
Fyodor Kupolov
|
d6d2855043
|
Fix AccountManagerServiceTest am: d954357860 am: 658b8e7e4b
am: eac40d9949
Change-Id: I27b4175f949e5416943a2a3782b772ce65b846e6
|
2016-08-30 17:12:50 +00:00 |
|
Dirk Dougherty
|
a33f506c80
|
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am: c2b9d55818 am: 61f52fca96 am: be1a09ef47 am: c49ce72fd8
am: 5d00f19d56
Change-Id: I831a64899605bac06f3a687906d36b3c9e5c6176
|
2016-08-30 17:12:45 +00:00 |
|
Dirk Dougherty
|
94d11ce283
|
Fetch ga script over https to avoid mixed content. am: b5760c1fe7 am: 324054e7d4 am: 26901d3715 am: 5e34cccda6
am: b130000df4
Change-Id: I87c1d102b884e8a0c34d74152c7701518540a110
|
2016-08-30 17:09:59 +00:00 |
|
Dirk Dougherty
|
796c3ded87
|
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am: c2b9d55818 am: 4019963b96
am: 968699da73
Change-Id: Iaaef50a5500469cfb5a66795fe9f87d34fcd5db7
|
2016-08-30 17:09:56 +00:00 |
|
Dirk Dougherty
|
6512ae7dbb
|
Fetch ga script over https to avoid mixed content. am: b5760c1fe7 am: 9ca38e3379
am: d3a7388469
Change-Id: I22fcacf94b4553379893bdc8ece9ebac4f62c3bd
|
2016-08-30 17:09:53 +00:00 |
|
Brian Duddie
|
398e930478
|
Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev am: 6bf3424ccf am: 34230195ab
am: 05f7e7aedf
Change-Id: I145a9a8655bdba5fa2af745db9c8c358d96efe79
|
2016-08-30 17:09:48 +00:00 |
|
Andrew Rossignol
|
9293b93f18
|
ContextHub: Avoid reference leaks am: c35104535c am: e2478c4cb6
am: e2107bfe13
Change-Id: Ice5979ec7e118a74abf4eb66267c7a1238f162b7
|
2016-08-30 17:09:45 +00:00 |
|
Neil Fuller
|
a402325510
|
Merge "Track java.lang.reflect.Executable API changes" am: 43ec5716aa am: eefc000601 am: d8d495f1eb
am: d97db3e80e
Change-Id: I01b15ae35aa3c66e4d98938bf1270ea2c4194a4a
|
2016-08-30 17:01:39 +00:00 |
|
Jason Monk
|
8e4fda7549
|
Merge "Backup system QS tiles" into nyc-dr1-dev am: f498d0d384 am: 68d7519060 am: b481f7ce7d
am: a99df5eee1
Change-Id: I4506095378615a3a92b472187c5a58f1f5604317
|
2016-08-30 17:01:33 +00:00 |
|
Jason Monk
|
90a788e29b
|
resolve merge conflicts of d70ed99 to master
Change-Id: I3a8d3708e050b3fb963dd057c0be9d2d249d037a
|
2016-08-30 10:54:03 -04:00 |
|
Victor Chang
|
3f98ea1eee
|
Merge "forceUpdateUserSetupComplete should have no effect in user build"
|
2016-08-30 12:38:53 +00:00 |
|
Greg Kaiser
|
808699f2bb
|
ContextHubService: Avoid uninitialized handle am: 9d4d881cc5 am: b70ed04911
am: d98afc1cc9
Change-Id: I13586a46e44442a962682b2c74e17187a0932cfe
|
2016-08-30 01:48:36 +00:00 |
|
Greg Kaiser
|
1d3e3eb83f
|
Merge "NanoAppFilter: Workaround HubId issues" into nyc-mr1-dev am: f8d61675ac am: a0ce60d36f
am: 429b812811
Change-Id: I710253406aa0940dc7214d160260757d251ccc96
|
2016-08-30 01:38:36 +00:00 |
|
Greg Kaiser
|
786676eb39
|
NanoAppFilter: Workaround HubId issues am: 3907049080 am: 41ef2a038d
am: d20ed26dff
Change-Id: Iba85f8939fca3bf097f8778fdd980bd9290a7530
|
2016-08-30 01:38:27 +00:00 |
|
Greg Kaiser
|
a1500b405c
|
Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev am: 18e59f2988 am: d06faffad8
am: f5a291c514
Change-Id: I506da83561fb47bcff273c7d61dc481b4912cb79
|
2016-08-30 01:38:16 +00:00 |
|
Greg Kaiser
|
fb574cb07f
|
ContextHubService: Maintain hub result meaning am: 6d9e7f669a am: 9ea48989ce
am: e84227f209
Change-Id: I84f8715bb57ec68c749c31abc0705c8f140a512e
|
2016-08-30 01:38:09 +00:00 |
|
Greg Kaiser
|
7976a9d440
|
Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev am: 1e07e392c3 am: d5b81eb77d
am: f207d60e2c
Change-Id: I189333c712c0ec1f59ef09f57baeb450797c6448
|
2016-08-30 01:38:02 +00:00 |
|
Greg Kaiser
|
45cad7f70c
|
ContextHubManager: Fix API documentation. am: fac5be2ace am: 921e7ef350
am: fce14d1808
Change-Id: Ib5e0ba71519b2be92064b691c4e7d5b1b51deb81
|
2016-08-30 01:32:36 +00:00 |
|
Greg Kaiser
|
2359eea5fb
|
Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev am: 6ef2cee605 am: bb4fbb631c
am: 32f2d7f838
Change-Id: Ibb33dc23d0db62093ab2f06f3cb8f67201a324ba
|
2016-08-30 01:28:32 +00:00 |
|
Greg Kaiser
|
3a6cd70b68
|
ContextHubService: Fix app query am: 10163d0dd2 am: c5ab788398
am: 460ad1b1dd
Change-Id: Id15440ab7b2f8f27069bb411c1a9786472bd30eb
|
2016-08-30 01:27:18 +00:00 |
|
Greg Kaiser
|
974c0b6a2c
|
ContextHubService: Don't double report app loads am: fe6d4f518a am: ca627a8cc3
am: 8c94f54e0f
Change-Id: I34887862a05e0cbe3c21e038c31072cd41f363a3
|
2016-08-30 01:26:40 +00:00 |
|
Greg Kaiser
|
2aa29a739e
|
ContextHubService: Make app handle size match Java am: f8210797ad am: ddf97f6b1f
am: 6143907a01
Change-Id: I5c29e31f4cb8d9ab736e3f6479e9b1d7c39c810c
|
2016-08-30 01:25:58 +00:00 |
|
Greg Kaiser
|
1e71d3b16b
|
ContextHubService: Update caches on nanoapp unload am: 0d052c9508 am: e7a0e1a771
am: 27452edbb1
Change-Id: I1afc8ea3d02b15e330908794346cd8a4a2cbf822
|
2016-08-30 01:24:27 +00:00 |
|
Erik Kline
|
bed286dca5
|
Merge "Add simple NetdService util class" into nyc-mr1-dev am: 592552220b am: 78540f798d
am: 2c2dcaf4fb
Change-Id: Ia8628594a109eb38cbc526192044ccd5f24cbe82
|
2016-08-30 01:24:22 +00:00 |
|
Erik Kline
|
f00f05318a
|
Add simple NetdService util class am: c1bc0be161 am: b92c7205dd
am: 1a35a05e56
Change-Id: I8e36534a1e9ad604cc7d7efc491e54c0ea530347
|
2016-08-30 01:24:19 +00:00 |
|
Mark Lu
|
026b6568e6
|
Merge "Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am: 314d995ca1 am: b3ab8337df" into nyc-mr1-dev am: 000289bc6c am: d6cfb23841
am: 437f55d0e6
Change-Id: I298d72f2283084ca64648ca442e76e9231238578
|
2016-08-30 01:24:12 +00:00 |
|
Mark Lu
|
23ad078c67
|
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am: 314d995ca1 am: b3ab8337df am: 4b492cbf09 am: 3e0f9837f3
am: 42ba1a85d3
Change-Id: I769c6be16c288b6e27c13bd8ee122e877709bafb
|
2016-08-30 01:24:09 +00:00 |
|
Mark Lu
|
0fdbb3c6be
|
Merge "docs: Fix typo and broken link in AsyncTask.java am: 53415ff24e am: bae52ec98c" into nyc-mr1-dev am: 6be20ff728 am: 426a9411a2
am: e99844d614
Change-Id: I97cf4ff7ca158ef50dab89abae9530dbb64ffd46
|
2016-08-30 01:20:38 +00:00 |
|
Mark Lu
|
0243c47622
|
docs: Fix typo and broken link in AsyncTask.java am: 53415ff24e am: bae52ec98c am: 86caa4aebf am: b48098f836
am: 5f43a76d5e
Change-Id: I6f169738940f9de5819ca6cf98ecbd23b5d7040f
|
2016-08-30 01:20:30 +00:00 |
|
Winson Chung
|
85301bae22
|
Merge "Fixing typo in dump log." into nyc-mr1-dev am: 5ebd73f8ff am: ba4744bc08
am: d79fc544e6
Change-Id: If9eb7b38c50d11fc046affe10002524c5476ea48
|
2016-08-30 01:20:21 +00:00 |
|
Winson
|
f59c50c4ab
|
Fixing typo in dump log. am: b43ba86811 am: 1de1a3bfcc
am: fc4a87580f
Change-Id: Id813187a627f795627a491cfe736f6e70d3e318a
|
2016-08-30 01:20:12 +00:00 |
|
Mark Lu
|
d21443052e
|
Merge "docs: fix link in Loader reference page" into nyc-dev am: 3c638c1ea1 am: ceaef72fb9 am: a5f090a768 am: 975704a737
am: 233e745bf6
Change-Id: I16b65a1ec53404db02a6d30426cd6636b226b49a
|
2016-08-30 01:20:00 +00:00 |
|
Mark Lu
|
f7e215616a
|
docs: fix link in Loader reference page am: 9f52b7a4a8 am: f496b9a981 am: e16c82d224 am: bfe0c86461
am: 45be550f69
Change-Id: I690f5655ec8a787d75f5bd86ba2df21e342ed9a8
|
2016-08-30 01:11:58 +00:00 |
|
Suprabh Shukla
|
f59b0447c4
|
Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev am: 769bc6c8b1 am: 9dbdbf461e
am: 29ac4b3f25
Change-Id: I7f55d2e0a89633283adb9cbb9b604473bb2cc781
|
2016-08-30 01:11:50 +00:00 |
|
Suprabh Shukla
|
888a45960a
|
Resolving race condition while writing recent taskids am: fd0bd4f39d am: c9e7c49def
am: e59b5664ab
Change-Id: I0a603cc99a2901147a65ded2b54e28d3545ff851
|
2016-08-30 01:11:43 +00:00 |
|
Sudheer Shanka
|
de90e22b23
|
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 am: 1167bcf2c9
am: 17636dac49
Change-Id: Idde167a3ce569954472fc8ebd03ad6a15088e634
|
2016-08-30 01:11:37 +00:00 |
|
Sudheer Shanka
|
431579ebfd
|
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 am: d57565864b am: c18b88c15d am: 1c153c697b am: 20e7a6b448" into nyc-mr1-dev-plus-aosp
am: cdaa07edc8
Change-Id: I4739d530849929d606e102df74d34996e5018190
|
2016-08-30 01:11:34 +00:00 |
|
Sudheer Shanka
|
1d0e9cc3a3
|
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 am: 1c153c697b am: 20e7a6b448
am: 80cbe5bc76
Change-Id: I99b2f17a800c714e36aa8a2840c7e1c7c0063dbc
|
2016-08-30 01:11:29 +00:00 |
|
Sudheer Shanka
|
04df0c5e8e
|
Merge "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 am: 2c18f32328 am: 7a50c5afd2" into nyc-mr1-dev-plus-aosp
am: e16ae22718 -s ours
Change-Id: I4b6612d1abd513bb8ddc4ae1005bfbe9b18f24bb
|
2016-08-30 01:05:40 +00:00 |
|