120478 Commits

Author SHA1 Message Date
John Spurlock
6090995951 Remove unused imports from frameworks/base.
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
2013-11-20 11:31:47 -05:00
George Mount
34d8519de4 Merge "Add animations along a Path." 2013-11-20 15:47:00 +00:00
George Mount
c96c7b2e54 Add animations along a Path.
Change-Id: If03bd10a3961ff874e33489e1253146b8dadca33
2013-11-20 07:39:26 -08:00
Chong Zhang
a68c87eda8 Only scan for wifi display when there is no active connections
Bug: 11717053
Change-Id: I4ab73f6517fbfb8fcc131b89d0e934380dcf69e0
2013-11-19 19:56:16 -08:00
Dirk Dougherty
7acec30ac7 am 3d763e25: am a9a39d6c: am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs
* commit '3d763e258b6643d29a495b5dfb1cb376e6b61f87':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
2013-11-19 18:24:20 -08:00
Dirk Dougherty
3d763e258b am a9a39d6c: am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs
* commit 'a9a39d6ca25796ba0fcf16ead3a9928f36b6444d':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
2013-11-19 18:20:40 -08:00
Dirk Dougherty
a9a39d6ca2 am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs
* commit 'acca12faea5fc1c9de63fdc08ae4d6bc0bad864a':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
2013-11-20 02:16:21 +00:00
Dirk Dougherty
acca12faea Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs 2013-11-20 02:13:48 +00:00
Dirk Dougherty
5f0462a4f5 Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
Change-Id: Ia75712323563cf56f0224822cb7977f3421f8527
2013-11-19 17:55:49 -08:00
Katie McCormick
7a7563c0bd am a99e486c: am 26574688: am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs
* commit 'a99e486c3a45c2ba96bce7a994e3b91f17b5f75f':
  Doc update: redo of new API Console steps.
2013-11-19 17:16:27 -08:00
Katie McCormick
a99e486c3a am 26574688: am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs
* commit '26574688b627f5b5d722834d73cba5f37185770f':
  Doc update: redo of new API Console steps.
2013-11-19 17:14:14 -08:00
Katie McCormick
26574688b6 am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs
* commit '39711934023b088887a08d833674170938f82a7d':
  Doc update: redo of new API Console steps.
2013-11-20 01:10:37 +00:00
Katie McCormick
3971193402 Merge "Doc update: redo of new API Console steps." into klp-docs 2013-11-20 01:07:56 +00:00
Tim Murray
d5d37170dd Merge "Convert Java/JNI to 64-bit, part 1." 2013-11-20 00:47:47 +00:00
Glenn Kasten
2a4768c735 KeypressInvalid_48k.ogg was 44.1 kHz previously
Command:
oggenc --resample 48000 -o ogg/KeypressInvalid_48k.ogg KeypressInvalid.wav

Change-Id: I862ba47f41eee8b6668cd45b9322f164fd652a7f
2013-11-19 16:40:06 -08:00
Svetoslav
8ef0c14858 Print service meta-data changes not handled properly.
The package monitor in the PrintManagerService was not overriding
the correct callback to capture changes in the print service package
including meta-data. Hence, there was a missed signal the the old
meta-data was used.

The implication is that if a vendor adds new feature such as custom
print options activity or print service settings that were not there
before, then they will not be show until the device reboots.

bug:11772977

Change-Id: Idf756c430f30ae6d16760a257c199a72a52cf5c5
2013-11-19 16:25:29 -08:00
Katie McCormick
6b372626e9 Doc update: redo of new API Console steps.
Fixes for:

b/11713745
b/11712882
b/10669388
b/10641901

Change-Id: I071eba31d51f0e29b9be4a7f7ede0f01c7a52838
2013-11-19 16:17:17 -08:00
Tim Murray
eff663f391 Convert Java/JNI to 64-bit, part 1.
This converts context and device storage to use long instead of int.

bug 11332320

Change-Id: If93a5d78385d3004d5e709762b78bd1d3538088d
2013-11-19 14:21:58 -08:00
Christopher Tate
266f48cc04 am c8ea38fe: am e3705342: am b0183f0a: Harden against transiently unavailable backup transports
* commit 'c8ea38fe18efb447a0f87aed60f511d14d2389fa':
  Harden against transiently unavailable backup transports
2013-11-19 11:53:02 -08:00
Christopher Tate
c8ea38fe18 am e3705342: am b0183f0a: Harden against transiently unavailable backup transports
* commit 'e3705342671d08b5cd94a0d69ef8099a2c3211f8':
  Harden against transiently unavailable backup transports
2013-11-19 11:48:50 -08:00
Christopher Tate
e370534267 am b0183f0a: Harden against transiently unavailable backup transports
* commit 'b0183f0ae311966cff0e10e8139c56f97288d1f2':
  Harden against transiently unavailable backup transports
2013-11-19 11:46:48 -08:00
Christopher Tate
b0183f0ae3 Harden against transiently unavailable backup transports
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Now with 100% less build break.

Bug 11716868

Change-Id: I2af4e93788068cfac97c0a48d3568c561eefa23d
2013-11-19 11:24:46 -08:00
Joe Fernandez
79992ca077 am f52450b1: am dcf78a05: am de4a8d85: Merge "Systrace doc updates" into klp-docs
* commit 'f52450b1f174eac239ffac67774960d547e295c8':
  Systrace doc updates
2013-11-19 11:20:41 -08:00
Joe Fernandez
f52450b1f1 am dcf78a05: am de4a8d85: Merge "Systrace doc updates" into klp-docs
* commit 'dcf78a0541665332792d3f645dda673a9add2c1e':
  Systrace doc updates
2013-11-19 11:16:30 -08:00
Joe Fernandez
dcf78a0541 am de4a8d85: Merge "Systrace doc updates" into klp-docs
* commit 'de4a8d851b18ac032f044fa39e5db2529dd33911':
  Systrace doc updates
2013-11-19 19:12:24 +00:00
Joe Fernandez
de4a8d851b Merge "Systrace doc updates" into klp-docs 2013-11-19 19:09:05 +00:00
Joe Fernandez
25ef208d7c Systrace doc updates
Update to reflect new user interface and command line options
in Android 4.3+. Also add section on using application-level
tracing.

Fixes for bugs:
b/7306847
b/10113361
b/9425766
b/7306847
b/9262485

Change-Id: Ia1c2a54fa2edc12cd68da27055aebe7ec47df745
2013-11-19 10:48:39 -08:00
Vinit Deshapnde
86513aafee Merge "Refactor WifiEnterpriseConfig and move service part in WifiConfigStore" 2013-11-19 18:47:37 +00:00
John Spurlock
15f7b19313 Merge "Fix logic problems in AnimationDrawable and View." 2013-11-19 17:48:51 +00:00
Dave Langemak
d487eb3c03 am 741c9c74: am d220d820: am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev
* commit '741c9c74ffead322c349242e3f72e8fd2957bd3d':
  Fix incorrent page range parsing when custom print options used.
2013-11-19 08:43:18 -08:00
Craig Mautner
a857baf96c am 8ef1c531: am be462aff: am 096de3c3: Merge "Notify apps when insets change." into klp-dev
* commit '8ef1c53177fa43cf78eb8911af77bde87c9c1536':
  Notify apps when insets change.
2013-11-19 08:43:13 -08:00
Dave Langemak
741c9c74ff am d220d820: am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev
* commit 'd220d8202e67a82075ee20351657509ca0885b67':
  Fix incorrent page range parsing when custom print options used.
2013-11-19 08:38:55 -08:00
Craig Mautner
8ef1c53177 am be462aff: am 096de3c3: Merge "Notify apps when insets change." into klp-dev
* commit 'be462affdbe9f962c495d6eeabdad645aa9baf03':
  Notify apps when insets change.
2013-11-19 08:38:51 -08:00
Dave Langemak
d220d8202e am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev
* commit 'c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1':
  Fix incorrent page range parsing when custom print options used.
2013-11-19 08:34:57 -08:00
Craig Mautner
be462affdb am 096de3c3: Merge "Notify apps when insets change." into klp-dev
* commit '096de3c3017bb9b9e5e1ed9ad790b7fedab95433':
  Notify apps when insets change.
2013-11-19 08:34:53 -08:00
Dave Langemak
c04aa87e4a Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 2013-11-19 16:33:22 +00:00
Craig Mautner
096de3c301 Merge "Notify apps when insets change." into klp-dev 2013-11-19 16:32:00 +00:00
Jeff Sharkey
2322205340 am 37ba54ac: am eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev
* commit '37ba54ac13e6f8cff70d3138a029cfdd4733aba7':
  Mask OOBE when filtering recent documents.
2013-11-19 00:17:23 -08:00
Jeff Sharkey
37ba54ac13 am eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev
* commit 'eb4dc749de7f6ee45cae070db960890643e94aff':
  Mask OOBE when filtering recent documents.
2013-11-19 00:13:26 -08:00
Jeff Sharkey
eb4dc749de am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev
* commit '6d0d4b5b5a66ea348c2cdd89a89d4ab7f0483829':
  Mask OOBE when filtering recent documents.
2013-11-19 00:11:15 -08:00
Jeff Sharkey
6d0d4b5b5a Merge "Mask OOBE when filtering recent documents." into klp-dev 2013-11-19 08:08:13 +00:00
Sascha Prueter
2e8e33bfd7 am a9249322: am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev
* commit 'a9249322d554fa13eb9c2662d39be256f833404f':
  Trying to unbreak build...
2013-11-18 23:35:15 -08:00
Sascha Prueter
a9249322d5 am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev
* commit 'c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4':
  Trying to unbreak build...
2013-11-18 23:31:11 -08:00
Sascha Prueter
c7f7d1bf18 am f7044fec: Merge "Trying to unbreak build..." into klp-dev
* commit 'f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18':
  Trying to unbreak build...
2013-11-18 23:27:07 -08:00
Sascha Prueter
f7044fecee Merge "Trying to unbreak build..." into klp-dev 2013-11-19 07:23:34 +00:00
Sascha Prueter
d5965cb506 Trying to unbreak build...
Revert "Harden against transiently unavailable backup transports"

This reverts commit 8f98252afea3fd0e68693635ec21b6004a52fa69.

Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a
2013-11-19 06:51:21 +00:00
Christopher Tate
f3f31142c6 am fa331b1d: am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev
* commit 'fa331b1dfbf3e071e2ff48dbe21727452bfb8042':
  Harden against transiently unavailable backup transports
2013-11-18 18:51:51 -08:00
Christopher Tate
fa331b1dfb am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev
* commit '1e964ed808798a56664853e2aeffdc47c676ac5a':
  Harden against transiently unavailable backup transports
2013-11-18 18:48:29 -08:00
Christopher Tate
1e964ed808 am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev
* commit 'd6bbc54423c0fb70e9e0415b3e8c12a435d715a1':
  Harden against transiently unavailable backup transports
2013-11-18 18:44:47 -08:00
Christopher Tate
d6bbc54423 Merge "Harden against transiently unavailable backup transports" into klp-dev 2013-11-19 02:41:54 +00:00