2851 Commits

Author SHA1 Message Date
Michael Wright
5f31a4bd90 Merge "Remove unnecessary input event indirection" 2013-11-08 23:25:37 +00:00
Elliott Hughes
443e3a209c am 5c1aa4ef: am ede7f9d3: am 9e71310d: Merge "Remove incorrect (and unused) capget code."
* commit '5c1aa4efa9568d38cd2e8756a274bb30ddd590ba':
  Remove incorrect (and unused) capget code.
2013-11-07 23:08:13 -08:00
Elliott Hughes
5c1aa4efa9 am ede7f9d3: am 9e71310d: Merge "Remove incorrect (and unused) capget code."
* commit 'ede7f9d3a39d87f12d58df495f28108784e9b588':
  Remove incorrect (and unused) capget code.
2013-11-07 23:05:33 -08:00
Elliott Hughes
ede7f9d3a3 am 9e71310d: Merge "Remove incorrect (and unused) capget code."
* commit '9e71310d15d9dfcbf5e1c94948e0260f3dc3e678':
  Remove incorrect (and unused) capget code.
2013-11-07 23:03:43 -08:00
Elliott Hughes
42a4bb5730 Remove incorrect (and unused) capget code.
Note that if you revert this change, the code it removes is incorrect,
and doesn't handle the top 32 bits of capabilities, one of which we're
already using: CAP_BLOCK_SUSPEND.

Bug: 11508244
Change-Id: Ice1f51334bce4941c6d24d6016450a2ebcf92886
2013-11-07 22:35:23 -08:00
Michael Wright
c9c487e6d6 Remove unnecessary input event indirection
Rather than have a class whose sole job is to pass messages to
PointerLocationView, just have it consume them itself.

Change-Id: I889ce35d99852f746499c0585dc7c43378b4c3a0
2013-11-07 18:55:09 -08:00
Jeff Brown
7da5bbedc7 am c2b652fd: am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev
* commit 'c2b652fd4d386b79dc99af249b6ad3844e53fdf1':
  Add media router service and integrate with remote displays.
2013-11-07 17:47:25 -08:00
Jeff Brown
c2b652fd4d am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev
* commit '5182ea4bb20ec8fbe9562d0eaae8135d433ea0b6':
  Add media router service and integrate with remote displays.
2013-11-07 17:44:14 -08:00
Jeff Brown
d40a4d74c6 Merge "Add media router service and integrate with remote displays." into klp-dev 2013-11-08 01:36:55 +00:00
Robert Greenwalt
d528d48e5d resolved conflicts for merge of c3eef190 to master
Change-Id: I36fd3c7fcbb13e47e27ffc340484c03b5a553bb1
2013-11-07 15:05:26 -08:00
Robert Greenwalt
c3eef19047 am f1612bcf: am e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
* commit 'f1612bcfdd2cb517948f14369fd0977ceb55d19c':
  Add BatteryStats for Wifi Batched Scanning.
2013-11-07 10:39:43 -08:00
Robert Greenwalt
e8c51298a4 Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev 2013-11-07 18:30:49 +00:00
Dianne Hackborn
c0b5351555 am 03be79b3: am fbf4888d: am 9882d388: Merge "Fix issue #11223338: Not retaining service started state while restarting" into klp-dev
* commit '03be79b35ca7060f383075a43ff19c8a9d63a7c0':
  Fix issue #11223338: Not retaining service started state while restarting
2013-11-07 10:24:22 -08:00
Dianne Hackborn
03be79b35c am fbf4888d: am 9882d388: Merge "Fix issue #11223338: Not retaining service started state while restarting" into klp-dev
* commit 'fbf4888d19b0c68d8004f9ad2423a583dc01178e':
  Fix issue #11223338: Not retaining service started state while restarting
2013-11-07 10:21:34 -08:00
Dianne Hackborn
9882d38899 Merge "Fix issue #11223338: Not retaining service started state while restarting" into klp-dev 2013-11-07 18:16:10 +00:00
Jeff Brown
69b07161be Add media router service and integrate with remote displays.
This change adds a new media router service whose purpose is to track
global state information associated with media routes.  This service
publishes routes to the media router instance in application processes
and handles requested state changes such as selecting or unselecting
global routes.  The service also binds to remote display provider
services which can offer new remote display routes to the system.

Includes a test application for manually verifying certain aspects
of the operation of the media router service.

The remote display provider interface is essentially a stripped down
media route provider interface as defined in the support library
media router implementation.  For now, it is designed to be used only
by first parties to publish remote display routes to the system so
it is not exposed as public API in the SDK.  In the future, the remote
display provider interface will most likely be deprecated and replaced
with a more featureful media route provider interface for third
party integration, similar to what is in the support library today.

Further patch sets integrate these new capabilities into the System UI
and Settings for connecting remote displays.

Bug: 11257292
Change-Id: I31109f23f17b474d17534d0f5f4503e388b081c2
2013-11-07 03:25:37 -08:00
Robert Greenwalt
a029ea1318 Add BatteryStats for Wifi Batched Scanning.
bug:10690989
Change-Id: Ia39b715ee6d5733970095bc76de0ed40ff8208c0
2013-11-06 17:43:18 -08:00
Dianne Hackborn
daa0d5c929 Fix issue #11223338: Not retaining service started state while restarting
When I cleaned up how we maintained the lifecycle of the tracker with a
service, I broke most tracking of the service restart state.  (Since at
that point the service is no longer associated with a process, so I
must clean up the tracker state).  This change introduces a new special
case for interacting with a service tracker to explicitly tell it when
a service is being restarted.  It also fixes how we update the process
state when services are attached to it, so it goes in and out of the
restarting state correctly.

In addition:

- Maybe fix issue #11224000 (APR: Dependent processes not getting added
  to LRU list).  We were not clearing ServiceRecord.app when bringing
  down a service, so if for some reason there were still connections to
  it at that point (which could happen for example for non-create bindings),
  then we would so it when updating the LRU state of that client process.
- dumpsys procstats's package argument can now be a package or process
  name, and we will dump all relevent information we can find about that
  name.
- Generally improved the quality of the dumpsys procstats output with its
  various options.
- Fixed a bug in ActivityManager.dumpPackageState() where it would hang if
  the service was dumping too much, added meminfo to the set of things
  dumped, and tweaked command line options to include more data.
- Added some more cleaning code to ActiveServices.killServices() to make
  sure we clean out any restarting ServiceRecord entries when a process is
  being force stopped.
- Re-arranged ActiveServices.killServices() to do the main killing of the
  service first, to avoid some wtf() calls that could happen when removing
  connections.

Bug: 11223338
Bug: 11224000

Change-Id: I5db28561c2c78aa43561e52256ff92c02311c56f
2013-11-06 16:42:17 -08:00
Patrick Tjin
09e0244f72 am b4328566: am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev
* commit 'b4328566fa415b69974a9721ec690a1b74880873':
  Add HSPA+ to BatteryStats
2013-11-06 10:22:32 -08:00
Patrick Tjin
b4328566fa am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev
* commit '5eecb9e8d44b3864a3261a3c5ebfbb9c606e77f5':
  Add HSPA+ to BatteryStats
2013-11-06 10:20:00 -08:00
Patrick Tjin
b71703cfdf Add HSPA+ to BatteryStats
HSPA+ was being shown as connection type other in battery
statistics because it was not updated when TelephonyManager
was changed.

Bug: 11552902
Change-Id: I85ce7c393bf93010a4ac8437f14684015ad0391a
2013-11-06 17:29:33 +00:00
Brian Carlstrom
c0b2d860ef am 01ac9531: Merge "Treat UnsatisfiedLinkError as non-fatal"
* commit '01ac953180d2ec2a020e1fc82bba8218c0aa4555':
  Treat UnsatisfiedLinkError as non-fatal
2013-11-05 10:08:06 -08:00
Brian Carlstrom
6f1a44f3de am 5f4a8948: am c8b01295: am 60999fcb: Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev
* commit '5f4a89480a6f5d3eb6ec7f7979f6555ae083c25f':
  Treat UnsatisfiedLinkError as non-fatal
2013-11-04 21:59:53 -08:00
Adam Powell
307182870d am a20bfd96: am fe803958: am 1262d0c8: Merge "Fix action menu visibility callbacks for nested popups" into klp-dev
* commit 'a20bfd96bae95bd54b20ebd184655d7211cedcb4':
  Fix action menu visibility callbacks for nested popups
2013-11-04 21:59:49 -08:00
Adam Powell
ccb5b6de00 am b688a0c9: am 9382a071: am b611eb94: Merge "Fix incorrect content description on action bar home/up" into klp-dev
* commit 'b688a0c9ac41fc5edc2fdbb515f1eda4869989c2':
  Fix incorrect content description on action bar home/up
2013-11-04 21:59:45 -08:00
Brian Carlstrom
6a429f5604 am 94edb339: am 10193b78: am a51052d1: Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev
* commit '94edb3390970c302be926b42e0f8a8da0d5d5960':
  Move set of persist.sys.dalvik.vm.lib to SystemServer only
2013-11-04 21:59:23 -08:00
Brian Carlstrom
5f4a89480a am c8b01295: am 60999fcb: Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev
* commit 'c8b01295bc5dcfcd2d9559f366e175db086eae37':
  Treat UnsatisfiedLinkError as non-fatal
2013-11-04 21:54:21 -08:00
Adam Powell
a20bfd96ba am fe803958: am 1262d0c8: Merge "Fix action menu visibility callbacks for nested popups" into klp-dev
* commit 'fe803958d8c38fa865116912cff95c436d6db4e2':
  Fix action menu visibility callbacks for nested popups
2013-11-04 21:54:18 -08:00
Adam Powell
b688a0c9ac am 9382a071: am b611eb94: Merge "Fix incorrect content description on action bar home/up" into klp-dev
* commit '9382a071612231ee355128f71efb5877550074d9':
  Fix incorrect content description on action bar home/up
2013-11-04 21:54:14 -08:00
Brian Carlstrom
94edb33909 am 10193b78: am a51052d1: Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev
* commit '10193b78b87a18e5fee7faa4890a01946934000c':
  Move set of persist.sys.dalvik.vm.lib to SystemServer only
2013-11-04 21:53:29 -08:00
Brian Carlstrom
ad13bd5c0d Treat UnsatisfiedLinkError as non-fatal
Bug: 11466297

(cherry picked from commit e92f19e58caa05f5f4086d12a6396116ce6182aa)

Change-Id: I449474078b9f465f1da26a27bf96f9c35d2bb2fc
2013-11-04 09:58:25 -08:00
Brian Carlstrom
60999fcb2e Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev 2013-11-04 17:57:15 +00:00
Adam Powell
1262d0c864 Merge "Fix action menu visibility callbacks for nested popups" into klp-dev 2013-11-04 17:55:24 +00:00
Brian Carlstrom
e92f19e58c Treat UnsatisfiedLinkError as non-fatal
Bug: 11466297
Change-Id: I12be43564da37290b3ee52b1858e44f2229711d9
2013-11-03 22:47:11 -08:00
Adam Powell
b411b32861 Fix action menu visibility callbacks for nested popups
When opening a submenu from a popup in ActionMenuPresenter, delegate
the submenu callbacks to the presenter callback registered on the
ActionMenuPresenter. This allows menu visibility callbacks to
propagate properly so that apps that hide their action bars after a
timeout can detect open menus that are deeply nested.

Bug 11429613

Change-Id: I3332886f08d4f9010f0875057c457566301d12ec
2013-11-01 18:22:11 -07:00
Adam Powell
f37a5139db Fix incorrect content description on action bar home/up
Some stray code from a previous change caused an erroneous content
description to be set on the wrong view in the action bar. Correct
this and sync with the right behavior.

Bug 10969992

Change-Id: I4deaa3528b4bc222e25354679fa93f8316fa2d70
2013-11-01 16:36:49 -07:00
Brian Carlstrom
5637ffced9 Move set of persist.sys.dalvik.vm.lib to SystemServer only
Bug: 11463182
Bug: 11479647
Change-Id: I38efdecdd65fe3efc9c33b4dc204a64543ae6377
2013-11-01 14:51:58 -07:00
Brian Carlstrom
3472338f12 am 68724352: am 3a9a2089: am e6411e68: Merge "Set persist.sys.dalvik.vm.lib at system server startup" into klp-dev
* commit '6872435264f720dd5f1471d279f3f2ee938802e5':
  Set persist.sys.dalvik.vm.lib at system server startup
2013-10-31 22:32:49 -07:00
Brian Carlstrom
6872435264 am 3a9a2089: am e6411e68: Merge "Set persist.sys.dalvik.vm.lib at system server startup" into klp-dev
* commit '3a9a2089852d18ef7abbb9476fc3455bfec5a880':
  Set persist.sys.dalvik.vm.lib at system server startup
2013-10-31 21:39:07 -07:00
Brian Carlstrom
ad46405358 Set persist.sys.dalvik.vm.lib at system server startup
Bug: 11463182
Change-Id: I4409e84570c4e27bf8da36d0aca87812a1c032a6
2013-10-31 15:29:40 -07:00
Satoshi Kataoka
f03ba0cace Ignore IME subtype switching support flag until it's ready
Bug: 7043015

Change-Id: Id55f4e23eb0931975c0f80fbd9cb28c2d29ac005
2013-10-30 12:26:28 -07:00
Satoshi Kataoka
02f8bf97e7 Merge "Refactor InputMethodAndSubtypeCircularList" 2013-10-30 19:16:06 +00:00
Jeff Brown
aa2f9f01fa am 81b7caf0: resolved conflicts for merge of 5214dae4 to klp-dev-plus-aosp
* commit '81b7caf0d12fb56ab40592467d6b1cbcaef8f0b4':
  handle negative temperature
2013-10-29 18:32:29 -07:00
Jeff Brown
81b7caf0d1 resolved conflicts for merge of 5214dae4 to klp-dev-plus-aosp
Change-Id: I769e7acbe207b9c3a60ff1576d11b3ab40b8c66d
2013-10-29 18:28:57 -07:00
Jeff Brown
5214dae44c am 6dbbba4e: Merge "handle negative temperature"
* commit '6dbbba4e9adc3f1c2481698e42f4ffc0c68937f1':
  handle negative temperature
2013-10-29 14:02:34 -07:00
Jeff Brown
6dbbba4e9a Merge "handle negative temperature" 2013-10-29 20:59:38 +00:00
Satoshi Kataoka
d787f69533 Refactor InputMethodAndSubtypeCircularList
Change-Id: I452bb01d4af7097d214f2c2e7ed58bf1ca9fa219
2013-10-28 18:57:32 -07:00
Amith Yamasani
34cafa4b9a am 8e4457b0: am d58317b2: am 368daafc: Merge "Only simulate the first click if "Always use" button is available" into klp-dev
* commit '8e4457b05e854b9dd6f81a8d5b123e810e079749':
  Only simulate the first click if "Always use" button is available
2013-10-24 12:40:14 -07:00
Amith Yamasani
8e4457b05e am d58317b2: am 368daafc: Merge "Only simulate the first click if "Always use" button is available" into klp-dev
* commit 'd58317b2824656727b24f0b4c99e091954d05125':
  Only simulate the first click if "Always use" button is available
2013-10-24 12:35:37 -07:00
Amith Yamasani
34d41e9a85 Only simulate the first click if "Always use" button is available
This prevents Keep from being selected automatically when shown in the Share dialog
if Keep was previously chosen by the user as Always use for a send action.
This was a regression introduced by the new intent disambig behavior.

Bug: 11294904
Change-Id: I6745060a8ee0a6d680e657b55ee46aaec27bbacb
2013-10-23 16:05:29 -07:00