drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,536 Commits 1 Branch 0 Tags
Commit Graph

120536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Platt
cb1254f1ab am e4e6b3cc: am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients" 
* commit 'e4e6b3cc1908c60bd0e45063116cf935b7aad56a':
  NsdService does not clean up after exiting clients
 2014-03-13 23:47:32 +00:00
Brian Carlstrom
2facefe648 am 00d115a7: resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp 
* commit '00d115a7533df23027f671c90c0ae52684392e4a':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.
 2014-03-13 23:43:37 +00:00
Dave Platt
e4e6b3cc19 am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients" 
* commit '21384faa2b3da619a54b35f15936c00593b30694':
  NsdService does not clean up after exiting clients
 2014-03-13 23:42:03 +00:00
Dave Platt
21384faa2b am f3a2895a: Merge "NsdService does not clean up after exiting clients" 
* commit 'f3a2895a31069a7c01c69d011b290fcfb3298b3c':
  NsdService does not clean up after exiting clients
 2014-03-13 16:38:59 -07:00
Dave Platt
f3a2895a31 Merge "NsdService does not clean up after exiting clients" 2014-03-13 23:35:15 +00:00
Brian Carlstrom
00d115a753 resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp 
Change-Id: I1f4e555773fe6138efaf73444525da0f747b01d5
 2014-03-13 16:35:09 -07:00
Dave Platt
f31760c634 NsdService does not clean up after exiting clients 
When a client of the NsdService exits, NsdService should
clean up the requests it has sent to the mDNS daemon:
cancel any pending resource-discovery and resource-resolution
queries, and remove any services registered by this client.

If this isn't done, several bad things happen. The daemon will
continue to run unnecessarily, will report service discoveries
that can't be forwarded on to the client, and will continue to
advertise service ports for an application which is no longer
running until the device is rebooted (mDNS pollution).

Bug: 9801184
Change-Id: I0aa7311480322aefcff16f902fbbf34f50985d38
 2014-03-13 23:16:30 +00:00
Joe Fernandez
8bb11153f9 am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs 
* commit 'f7267c8bdc5431d486e8bb34722d492be82e44f3':
  Doc change: Update developer video on home page carousel.
 2014-03-13 22:15:11 +00:00
John Spurlock
ad66c27b9c am 6d9b034c: Fix typo in public logcat page. 
* commit '6d9b034ce169eeaa7e49574f4694ec96651c7f4e':
  Fix typo in public logcat page.
 2014-03-13 22:15:09 +00:00
Ricardo Cervera
8714a3437e am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs 
* commit 'ef6c94700589958789039749248895a2631ebe55':
  docs: Added step to get JDK to the Android Studio install instructions.
 2014-03-13 22:15:06 +00:00
Katie McCormick
b681794d25 am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs 
* commit '07c0ad973a2fdd8a35b3627e69f1134673c8b8e0':
  Doc update: new doc studio layout editor
 2014-03-13 22:15:01 +00:00
John Spurlock
62826f55be am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit 'f6228d95eae7b05dd0015b3062e72c89148e65a2':
  Fix doc typos in AppOpsManager.java
 2014-03-13 22:14:57 +00:00
JP Abgrall
4ecd833ee3 am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 
* commit '7baa7c804501b9cbcb5de281c5ddfaf03ba08f7a':
  ConnectivityService: add support to set TCP initial rwnd
 2014-03-13 20:36:51 +00:00
JP Abgrall
7baa7c8045 Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 2014-03-13 20:33:44 +00:00
Naofumi Harada
0a167a9865 am 107041e2: am 03263ce3: am 3b182261: am 68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
* commit '107041e299a48f9624bf7a70c003effac1c363ce':
  DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-03-13 18:30:31 +00:00
Chad Brubaker
0b925975b8 am 48dd8b0f: am 74f99a4e: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev 
* commit '48dd8b0fc0090ebf6cef0a9ac045fc480dd31397':
  Only allow System apps to make VPN exempt routes
 2014-03-13 18:30:28 +00:00
Chad Brubaker
6467e900a1 am 7f68f7f4: am f5729a6a: am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit '7f68f7f4a128538c1bbd33c82a40f0cc15994bf9':
  Add the calling package name to requestRouteToHost
 2014-03-13 18:30:25 +00:00
Naofumi Harada
107041e299 am 03263ce3: am 3b182261: am 68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
* commit '03263ce38aaca11300595af19d313a9f6e3ead96':
  DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-03-13 18:23:03 +00:00
Chad Brubaker
48dd8b0fc0 am 74f99a4e: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev 
* commit '74f99a4e904af56a62f86b81831c23c763b6001e':
  Only allow System apps to make VPN exempt routes
 2014-03-13 18:23:00 +00:00
Chad Brubaker
7f68f7f4a1 am f5729a6a: am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit 'f5729a6a1573ba27f69a5c5dc144be3f8f60b026':
  Add the calling package name to requestRouteToHost
 2014-03-13 18:22:57 +00:00
Narayan Kamath
aa737c49df am 9af19bee: am 52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt. 
* commit '9af19bee1c7da8d2e8bc6e40c6e9c1e28e0640c6':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.
 2014-03-13 18:18:48 +00:00
Naofumi Harada
03263ce38a am 3b182261: am 68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
* commit '3b18226133f27a5fe9e18f7da17d4cd0d0fa0471':
  DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-03-13 18:18:45 +00:00
Chad Brubaker
74f99a4e90 am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev 
* commit '7fb074389370ac93afc5830189371dc3ec26265c':
  Only allow System apps to make VPN exempt routes
 2014-03-13 18:18:40 +00:00
Chad Brubaker
f5729a6a15 am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit '1011960c44a4f84d53d05199fe1ca09be9473822':
  Add the calling package name to requestRouteToHost
 2014-03-13 18:18:36 +00:00
Chad Brubaker
78f204aed8 am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 
* commit '8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac':
  Remove SO_BINDTODEVICE from VPN protect
 2014-03-13 18:12:36 +00:00
Chad Brubaker
8e240af51d Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 2014-03-13 18:09:58 +00:00
Jose Lima
4882ddfae2 am 53ac5ef2: am 91726f4e: Merge "Add banner attribute to app manifest" into klp-modular-dev 
* commit '53ac5ef2141c7e7d99d5c00195bc65e86e7fc403':
  Add banner attribute to app manifest
 2014-03-13 18:08:51 +00:00
Christopher Tate
83b31aae81 am d5b25cbd: am aaaeb6a2: am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit 'd5b25cbd570680c361da8807fdfddf135472d338':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-13 18:08:49 +00:00
Baligh Uddin
e4f1c8ab27 am c48e3d03: (-s ours) am 4c9ebc4c: (-s ours) am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c48e3d03436bd428ef5425114ea138ae097f1f20':
  Import translations. DO NOT MERGE
 2014-03-13 18:08:46 +00:00
Alan Viverette
70994e9eef am d7cc4bf4: am cf2b65ce: am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit 'd7cc4bf482d69d146eb5386b790816c8a46f278a':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-13 18:08:43 +00:00
Alan Viverette
17bbdcc549 am 839321a3: am c25dbb50: am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit '839321a362ec1cd40fc7267a7883641bcc8ee429':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-13 18:08:40 +00:00
Alan Viverette
c59474d281 am ba3d0fd5: am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit 'ba3d0fd5fc520d1a6dcf6e6abc5f9d90c08e9f88':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-13 18:08:37 +00:00
Adam Powell
b287043c3d am 4a5c9e94: am 68ec033b: am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '4a5c9e941a78299d869b4c9d916fd86187057150':
  Fix a bug in submenu presenter priority handling
 2014-03-13 18:08:34 +00:00
Jason Sams
440613f5c3 am 276565c8: am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build. 
* commit '276565c83c05e24819454dea4008ad5096792e4f':
  Force merge of remaining KLP changes to fix build.
 2014-03-13 18:08:31 +00:00
Jose Lima
53ac5ef214 am 91726f4e: Merge "Add banner attribute to app manifest" into klp-modular-dev 
* commit '91726f4ea7b60025490209ccb2637d712e8d75fd':
  Add banner attribute to app manifest
 2014-03-13 18:02:50 +00:00
Christopher Tate
d5b25cbd57 am aaaeb6a2: am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit 'aaaeb6a21bb6cc540fefa6868493bda612a63f22':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-13 18:02:45 +00:00
Baligh Uddin
c48e3d0343 am 4c9ebc4c: (-s ours) am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4c9ebc4c149627e4ea0ee82f053628021ef8bfe8':
  Import translations. DO NOT MERGE
 2014-03-13 18:02:42 +00:00
Alan Viverette
d7cc4bf482 am cf2b65ce: am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit 'cf2b65ce7a5a1d60755a00ae4da6cd6b1101af8c':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-13 18:02:17 +00:00
Alan Viverette
839321a362 am c25dbb50: am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit 'c25dbb50c30816c97227b9a26cc46afec4e5318e':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-13 18:02:14 +00:00
Alan Viverette
ba3d0fd5fc am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit 'af6288b721110ffc4b4e68d55398b5ca31fc32e8':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-13 18:02:11 +00:00
Adam Powell
4a5c9e941a am 68ec033b: am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '68ec033b7c9ea28155bbb007b01d5dbce2239392':
  Fix a bug in submenu presenter priority handling
 2014-03-13 18:02:08 +00:00
Jason Sams
276565c83c am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build. 
* commit '0ebc6b378dca76b3253b10cf17c3a38a0a50c073':
  Force merge of remaining KLP changes to fix build.
 2014-03-13 18:02:03 +00:00
Jose Lima
91726f4ea7 Merge "Add banner attribute to app manifest" into klp-modular-dev 2014-03-13 17:40:37 +00:00
Svetoslav
fc1d04714e am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '11b7d9fa6685e742f5b3e3235a8e6e4920dbed02':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-13 17:31:03 +00:00
Svetoslav
11b7d9fa66 Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 2014-03-13 17:26:44 +00:00
Adrian Roos
16858164c7 am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev 
* commit 'cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-13 17:26:26 +00:00
Adrian Roos
cd0d8cb2d9 Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev 2014-03-13 17:22:58 +00:00
Christopher Tate
aaaeb6a21b am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit '87503f8561296fea489f8a3fe8384f61150976da':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-13 17:19:17 +00:00
Baligh Uddin
4c9ebc4c14 am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274':
  Import translations. DO NOT MERGE
 2014-03-13 17:19:14 +00:00
Joe Fernandez
f7267c8bdc Merge "Doc change: Update developer video on home page carousel." into klp-docs 2014-03-13 17:15:16 +00:00