112130 Commits

Author SHA1 Message Date
Dianne Hackborn
a4796d51f6 Merge "Fix to show correct duration." into klp-dev 2013-09-06 18:48:02 +00:00
Dianne Hackborn
d6d54a4694 Fix to show correct duration.
Change-Id: I1032d90d5b7bf39006b20f3374104421dcc53305
2013-09-06 11:46:43 -07:00
Igor Murashkin
034052b352 Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev 2013-09-06 18:32:30 +00:00
Adam Powell
b8b017cb68 Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev 2013-09-06 18:15:28 +00:00
David Christie
ba957652bf Merge "Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI." into klp-dev 2013-09-06 18:09:20 +00:00
David Christie
a2b73480c0 Fix QuickSettings to honor location setting for restricted users (b/10553306).
Generally when a user is location restricted, location will be off.
But just in case location is on and locked in that state, we should
respect that in the UI.

Change-Id: I112139db447ba6dbf4c7c38600406fb5ba6a1fa8
2013-09-06 10:57:00 -07:00
Jeff Sharkey
6d97d3c1a2 Another asset drop, provider icons, tests.
Latest asset update, including provider icons which are treated as
special cases for now instead of checking into separate apps.  Add
tests for MIME type matching of roots.  Remove unused XML.

Bug: 10510022
Change-Id: Id567a9e06ba241f60ac011823e550253c6c797fb
2013-09-06 10:46:54 -07:00
Chris Craik
9b40bdf644 Merge "Dump the right matrix when logging display lists" into klp-dev 2013-09-06 17:43:02 +00:00
Lajos Molnar
14add7b3e9 Merge "MediaPlayer.MTP: fix issue when main thread had no looper" into klp-dev 2013-09-06 17:40:55 +00:00
Vinit Deshapnde
6a3b7db257 am 771c11b7: Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev
* commit '771c11b73941994d24e5da5851451ee4088499a6':
  Fix duplicate SSID entries in the WifiSettings UI
2013-09-06 10:28:56 -07:00
Vinit Deshapnde
771c11b739 Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev 2013-09-06 17:26:39 +00:00
Jeff Sharkey
775bdbdb11 am dc8d7048: Merge changes I7277880e,Ia5584bd6 into klp-dev
* commit 'dc8d704899716e97e59af8b6fe5f549e0229eda6':
  Provide calling package to ContentProviders.
  Separate root and document management.
2013-09-06 09:29:05 -07:00
Jeff Sharkey
dc8d704899 Merge changes I7277880e,Ia5584bd6 into klp-dev
* changes:
  Provide calling package to ContentProviders.
  Separate root and document management.
2013-09-06 16:26:34 +00:00
Wink Saville
78f4e10bb2 am a1d6a9b4: am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
* commit 'a1d6a9b474ba095860838c6ed3e72f8d9f5058cd':
  Do not change NetworkInfo.DetailedState.
2013-09-06 09:25:32 -07:00
Wink Saville
a1d6a9b474 am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
* commit 'fc7a146b82774514bad4bc307489ece7ac27ee50':
  Do not change NetworkInfo.DetailedState.
2013-09-06 09:19:40 -07:00
Wink Saville
fc7a146b82 am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
* commit '50f864480d6e9cf9e4d83b4533e3764753b4d408':
  Do not change NetworkInfo.DetailedState.
2013-09-06 09:17:19 -07:00
Wink Saville
50f864480d am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
* commit '59a9884bf8280e2db9db7680370e98f40a065d56':
  Do not change NetworkInfo.DetailedState.
2013-09-06 09:12:50 -07:00
Wink Saville
59a9884bf8 Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 2013-09-06 16:09:36 +00:00
Lajos Molnar
a67a4439ca MediaPlayer.MTP: fix issue when main thread had no looper
We fall back to using the application's main looper similarly to MP,
and even create our own looper if MP was created outside of an
application context.  Always creating our own looper is a waste
of resources.

Also resolved issue with MP.reset() when created outside of an
application context, and removed MP.MTP's unused getHandler().

Change-Id: I9c3b8a2f05a9e231ae9c008bc1a48d6b991cec1d
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10634238
2013-09-06 08:53:20 -07:00
Jeff Sharkey
911d7f411f Provide calling package to ContentProviders.
The calling package is important for ContentProviders that want to
grant Uri permissions as a side effect of operations, so offer it
through a new API.  Validates the provided package against the
calling UID before returning.

Bug: 10626527
Change-Id: I7277880eebbd48444c024bcf5f69199133cd59e4
2013-09-06 08:08:18 -07:00
Jeff Sharkey
a61dc8e03e Separate root and document management.
Two hidden intents for managing roots and documents, used to support
Downloads UI.  Touching an item tries launching as MANAGE_DOCUMENT
first before falling back to VIEW.  Provide MIME type for roots.

Bug: 10446265, 10531347, 10599641
Change-Id: Ia5584bd6ce3e5a9b0048e8caf1447e3053664413
2013-09-06 08:08:18 -07:00
Mikhail Naganov
708d279a16 am 498a5f54: Merge "Add more docs for WebView\'s setInitialScale and setLoadWithOverviewMode" into klp-dev
* commit '498a5f5488446e1d5914f5d335ee02572c6201d1':
  Add more docs for WebView's setInitialScale and setLoadWithOverviewMode
2013-09-06 07:41:08 -07:00
Mikhail Naganov
498a5f5488 Merge "Add more docs for WebView's setInitialScale and setLoadWithOverviewMode" into klp-dev 2013-09-06 14:36:29 +00:00
Baligh Uddin
ddde9617d6 am f96b104a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'f96b104a7f6e4c2a8883b6d4de69e6de24aa8edc':
  Import translations. DO NOT MERGE
2013-09-05 22:00:50 -07:00
Baligh Uddin
f96b104a7f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-06 04:56:22 +00:00
Lorenzo Colitti
6bddc31755 am eadf1959: Merge "Track IP addresses in WifiStateMachine." into klp-dev
* commit 'eadf1959fbe2602f2c2b64ab0c4cd71a57d4f98c':
  Track IP addresses in WifiStateMachine.
2013-09-05 20:32:32 -07:00
Lorenzo Colitti
eadf1959fb Merge "Track IP addresses in WifiStateMachine." into klp-dev 2013-09-06 03:30:15 +00:00
Mathias Agopian
97f0aa6f8a tweak the electron beam animation a bit
we make the "beam" vanish in the center of the screen.

Bug: 10641933

Change-Id: I61fdb4d46e9f62dc80d65356a884dff0b177384a
2013-09-05 18:58:51 -07:00
Michael Wright
f17e8ee379 am 86974463: Merge "Added support for supports-input manifest element" into klp-dev
* commit '86974463e9e28108e14fa255efd3c429358c0605':
  Added support for supports-input manifest element
2013-09-05 18:31:04 -07:00
Michael Wright
86974463e9 Merge "Added support for supports-input manifest element" into klp-dev 2013-09-06 01:29:35 +00:00
Michael Wright
eaeb190486 Added support for supports-input manifest element
Change-Id: Ifa7c87908081585c1940b5a47fdf5138a287d9ea
2013-09-05 18:15:57 -07:00
Svetoslav
833384ba11 am 23e2bba4: Merge "Spooler broken on upgrade." into klp-dev
* commit '23e2bba4e17662e941c2c6672f66249aff4a0470':
  Spooler broken on upgrade.
2013-09-05 17:05:14 -07:00
Svetoslav
23e2bba4e1 Merge "Spooler broken on upgrade." into klp-dev 2013-09-06 00:00:22 +00:00
Alan Viverette
47361ddd0a am 0ccef4d0: Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev
* commit '0ccef4d00357275f3a492e10f4e88aaf4d9deec6':
  Apply implicit parent dependency when adding to PreferenceGroup
2013-09-05 16:40:39 -07:00
Alan Viverette
0ccef4d003 Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev 2013-09-05 23:36:18 +00:00
Baligh Uddin
b3d69bf95e am ca5d413e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ca5d413eb978db22ec1c0f327e10b1ecf793792d':
  Import translations. DO NOT MERGE
2013-09-05 16:33:45 -07:00
Baligh Uddin
ca5d413eb9 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-05 23:28:26 +00:00
John Spurlock
773dd9d58b am bd847601: Merge "Remove opaque-on-interaction from nav bar." into klp-dev
* commit 'bd8476016576124e82a23de864faf587299f6826':
  Remove opaque-on-interaction from nav bar.
2013-09-05 16:22:35 -07:00
Lorenzo Colitti
34b2b9b6db Track IP addresses in WifiStateMachine.
This makes WifiStateMachine listen for interface address
changes. When an address changes, WifiStateMachine will update
its LinkProperties to match reality and notify the system that
the link configuration has changed. This allows wifi to keep
track of IPv6 addresses as well (previously it only knew about
the IPv4 address passed in by DHCP).

IP addresses are obtained directly from the kernel and always
match those configured on the interface, so we treat them as
authoritative and ignore addresses passed in via DHCP (by the
time DHCP passes them in we've already been notified by the
kernel anyway).

Since we now have multiple sources of link information (the
kernel for addresses and DHCP for routes and DNS, plus various
bits of static information), also move all the code that sets
mLinkProperties into one place. This allows us to be clearer
about who is authoritative for which parts of mLinkProperties.

Bug: 10232006
Change-Id: I4f262342379ce7fed172b67a1d403e3cd34f4232
2013-09-06 08:21:23 +09:00
John Spurlock
bd84760165 Merge "Remove opaque-on-interaction from nav bar." into klp-dev 2013-09-05 23:20:00 +00:00
Svetoslav
1a3ef4fafb Spooler broken on upgrade.
The spooler apk was signed with the platform certificate and used
a redundant shared user id. Now the spooler is signed with a default
certificate and uses the same share user id. Since the shared user
id is associated with the platform certificate the package manager
rejects the spooler apk because it requested the same shared user id
with a different certificate. This change removes the unnecessary
shared user id from the manifest.

Change-Id: I208ef17fc6c25e67338682e56f9ce0e7e9d65642
2013-09-05 16:19:19 -07:00
Christopher Tate
abe49dafa0 am 8fe79f66: Merge "Turn off verbose wakeup-alarm stats" into klp-dev
* commit '8fe79f666dc1ba4b7820e412bb6aa8aea7d4b151':
  Turn off verbose wakeup-alarm stats
2013-09-05 16:15:48 -07:00
Christopher Tate
8fe79f666d Merge "Turn off verbose wakeup-alarm stats" into klp-dev 2013-09-05 23:13:20 +00:00
Victoria Lease
6527604ae7 add NotoSansSymbols to fallback chain
Bug: 10639804
Change-Id: I56fcdd980c2b8c2a4d631e93cbc3252d125c197d
2013-09-05 16:11:56 -07:00
Chris Craik
66063ae2d6 Dump the right matrix when logging display lists
bug:10631274
Change-Id: I6b32bfcb3e207321da60807091d7ac0ecf6112ab
2013-09-05 16:11:18 -07:00
Lorenzo Colitti
cf71220223 am a7597d17: Merge "Add a function to replace all the link addresses." into klp-dev
* commit 'a7597d17714e8aa975a4692cd7e9656d8bfa2e2c':
  Add a function to replace all the link addresses.
2013-09-05 16:06:12 -07:00
Lorenzo Colitti
a7597d1771 Merge "Add a function to replace all the link addresses." into klp-dev 2013-09-05 23:03:24 +00:00
Amith Yamasani
3d27c9f973 am f1eebfc2: Merge "Remove unused APIs and rename others based on API review" into klp-dev
* commit 'f1eebfc2cf47b7fb6ed8dfd06fb124f78ca3519e':
  Remove unused APIs and rename others based on API review
2013-09-05 15:51:34 -07:00
Amith Yamasani
f1eebfc2cf Merge "Remove unused APIs and rename others based on API review" into klp-dev 2013-09-05 22:48:17 +00:00
Michael Wright
add9898c72 am 7314eb08: Merge "Fix broken copy of kl/kcm/idc files to system image" into klp-dev
* commit '7314eb087f7318118fbf80827789a2626a8f66b5':
  Fix broken copy of kl/kcm/idc files to system image
2013-09-05 15:33:55 -07:00