92997 Commits

Author SHA1 Message Date
Oscar Rydhé
1c25a21ffc Fallback to fallbackring if ringtone can't be played.
If the specified ringtone file exists but cannot be played
the Ringtone will try to play the ringtone in a remote player.
But since the file is corrupt it will not be played in the
remote player either.
According to the documentation it should attempt to
fallback on another sound. This commit will do that.

Change-Id: I0216d61ca874eef0f168ad4d5bfb07491e01e654
2012-11-16 14:22:14 +01:00
Anders 3 Fridlund
36bc5b67eb Move NTP updates outside locks
When the ServerThread handles ACTION_SHUTDOWN intent it sometimes get
stuck on mStatsLock in NetworkStatsService.java.
0  com.android.server.net.NetworkStatsService$5.onReceive()
1  android.app.LoadedApk$ReceiverDispatcher$Args.run()
2  android.os.Handler.handleCallback()
3  android.os.Handler.dispatchMessage()
4  android.os.Looper.loop()
5  com.android.server.ServerThread.run()
This happens when the NetworkStats thread is already holding the
mStatsLock while updating NTP.
0  libcore.io.Posix.getaddrinfo()
1  libcore.io.ForwardingOs.getaddrinfo()
2  java.net.InetAddress.lookupHostByName()
3  java.net.InetAddress.getAllByNameImpl()
4  java.net.InetAddress.getByName()
5  android.net.SntpClient.requestTime()
6  android.util.NtpTrustedTime.forceRefresh()
7  com.android.server.net.NetworkStatsService.performPoll()
8  com.android.server.net.NetworkStatsService.access$100()
9  com.android.server.net.NetworkStatsService$2.onReceive()
10 android.app.LoadedApk$ReceiverDispatcher$Args.run()
11 android.os.Handler.handleCallback()
12 android.os.Handler.dispatchMessage()
13 android.os.Looper.loop()
14 android.os.HandlerThread.run()
Since the NTP update consists of several socket operations it may get
stuck long enough to trigger a System Server Watchdog even though the
socket timeout is set to 20 second.
Further, the NTP update doesn't actually need to be performed inside
the locks and an attempt to change this was made earlier, but the code
wasn't actually moved outside the locks.

Change-Id: Ib37a2b8c2d51a01adb7ff01764f82309433703f0
2012-11-16 13:28:29 +01:00
Yoshihiko Ikenaga
7d9cf119d1 Fixed typo and space.
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-11-16 16:59:36 +09:00
Scott Main
fa1320e614 docs: revise getting started intro
Change-Id: I7561da6ae2f21e31370f5dbbd121f2c6084523c1
2012-11-15 18:30:17 -08:00
Scott Main
4e2e9bae40 docs: update checksums/sizes for new adt bundles
Change-Id: Id1245a9f1ce7cf4854e8f39a9938b00aa18e4cca
2012-11-15 17:09:19 -08:00
Scott Main
d4ff824915 Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev 2012-11-15 15:19:11 -08:00
Scott Main
49ba8eb06b docs: update sdk install to handle both 32 and 64-bit bundles
Change-Id: I171f28a332c4d31600865f6ad8f6a95fb4f0c3aa
2012-11-15 14:56:52 -08:00
Scott Main
7425bf864e Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev 2012-11-15 11:04:38 -08:00
Scott Main
9886540d88 docs: fix ndk tos layout for small screens
Change-Id: I95e11481cdfe759416b4a661580ee9e6b0dd24d2
2012-11-15 11:03:46 -08:00
Scott Main
bce268034e docs: fix broken youtube playlists
Change-Id: I07a1e9af2c8104a56c9a5e6d1060de7578cbd1ae
2012-11-15 10:26:40 -08:00
kmccormick@google.com
480ac7fca6 am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit '596d0e3881782096f7a6ea9959e8dc5f07004623':
  Doc Update: Fixing images
2012-11-15 09:51:56 -08:00
kmccormick@google.com
596d0e3881 am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit 'f53c5f3683b71d232a78e04ea06649dd5e4bfee1':
  Doc Update: Fixing images
2012-11-15 09:49:21 -08:00
kmccormick@google.com
f53c5f3683 am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit 'd1ae2721fa7b350b979e75319812636ea31bb56b':
  Doc Update: Fixing images
2012-11-15 09:45:46 -08:00
&& repo sync -j8
d1ae2721fa Merge "Doc Update: Fixing images" into jb-dev-docs 2012-11-15 09:43:18 -08:00
Baligh Uddin
c3b6ee6068 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-15 08:13:48 -08:00
Baligh Uddin
36c7d313af Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-15 08:02:17 -08:00
Björn Lundén
1129a85203 Framework: Use holo alert drawables
Replaces the current usage of the GB alert
drawable with theme-consistent holo ones.

Change-Id: I8594ef8276db5bb0e192f3a541937d7281321043
2012-11-15 15:32:02 +01:00
Scott Main
0034beab72 resolved conflicts for merge of 783e115b to jb-mr1-dev
Change-Id: Ibfd3023a845fb6cc549f05bcff2d6e4abc7e5a07
2012-11-14 19:10:18 -08:00
Scott Main
783e115b60 resolved conflicts for merge of e907a390 to jb-dev-plus-aosp
Change-Id: I4e216b81f33b4b7c238f74f1c475bc84df3f79ef
2012-11-14 19:04:05 -08:00
&& repo sync -j8
1019a9c44e Doc Update: Fixing images
Bug: 7542170
Change-Id: I18e5d360e21af9d30864456ae429b804314e1edb
2012-11-14 18:27:36 -08:00
&& repo sync -j8
91cd7a7d52 Doc Update: Removed "no guaranteed delivery" line.
Change-Id: I6f5b80d263069752b7d47b5825ff024b1858e41e
2012-11-14 18:15:53 -08:00
Scott Main
e907a3909d am 22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis
* commit '22cc2764cc74e52888b043e0c6371594305bb5e9':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
2012-11-14 17:38:15 -08:00
Scott Main
22cc2764cc implement new organization for Training classes
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.

Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a
2012-11-14 17:30:24 -08:00
Joe Fernandez
e3be79be3f Merge "docs: Added note on MIPS system image additions" into jb-mr1-dev 2012-11-14 16:57:30 -08:00
Scott Main
8680f8ff6d Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev 2012-11-14 15:10:18 -08:00
Scott Main
226fe97155 docs: add warning for adt bundle on 32-bit os
Change-Id: I0a2a62f66e64290006d67b9509b4223588d654b7
2012-11-14 15:09:45 -08:00
Kenny Root
e4163e96e0 Merge "Switch keystore to binder" 2012-11-14 14:17:28 -08:00
Quddus Chong
73b1f68e3c Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev 2012-11-14 13:08:26 -08:00
Quddus Chong
8fcab20dfd docs: Updated uiautomator API docs to reflect correct API level.
bug: 7538348

Change-Id: I03cdc53096a87e79ed8d4584dd0f726e8337c2a2
2012-11-14 11:53:34 -08:00
Joe Fernandez
3d4f229172 docs: Added note on MIPS system image additions
Change-Id: I21e79563ea92358f274c90d3495439182aa4450e
2012-11-14 11:37:34 -08:00
Roman Nurik
6ed4801519 Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev 2012-11-14 11:34:03 -08:00
Martin Storsjo
93077a2902 MediaCodec: Allow getting the codec info directly
This saves the caller from manually iterating through the
MediaCodecList for finding the right codec.

This adds new public API.

Change-Id: I8462f040573427542d86d1b957a5aef53dd55e8e
2012-11-14 20:52:01 +02:00
Roman Nurik
2a45c152bd docs: Update Nexus 10 device frames for darker, more accurate bezel rendering.
Change-Id: Id0a17f187c4ca3c24295257b0c5ca653d1c8cd4d
2012-11-14 10:49:08 -08:00
Baligh Uddin
dd0ffba856 Import translations. DO NOT MERGE
Change-Id: I28291cc43ab74267b771dacf7dc570447a4a3dcf
Auto-generated-cl: translation import
2012-11-14 10:39:26 -08:00
Baligh Uddin
2303f4242f Import translations. DO NOT MERGE
Change-Id: I44ee12f2a6399347b884f91259117be4774b964b
Auto-generated-cl: translation import
2012-11-14 10:11:28 -08:00
Kenny Root
be37b5fa24 Merge "Free resources in correct order in ResStringPool::uninit" 2012-11-14 09:33:49 -08:00
Kenny Root
6b77645aa9 Switch keystore to binder
Change-Id: I9fa1fc05068bee1eed3f618fb32f70cf3d4c05d4
2012-11-14 08:45:52 -08:00
Kenny Root
87ed0a10f5 Merge "Bug fix on installd with SELinux enabled kernel." 2012-11-14 08:38:35 -08:00
rpcraig
2e59369dca Bug fix on installd with SELinux enabled kernel.
setfilecon is not required on libsymlinks when target
doesn't exist. A bootloop is caused without this
change.

Change-Id: I96dbd4b1f47a752bfcaf6016c81fd43083c4a6e1
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2012-11-14 10:16:03 -05:00
Martin Storsjo
056ef2ed5f MediaCodec: Allow getting the chosen component name
Currently, when the codec was opened by createDecoder/EncoderByType,
the caller does not know what codec actually was chosen, and
(for encoders) thus cannot know what color formats it supports.

This adds new public API.

Change-Id: Ie471f40f8104b37d27ced3dba5a54facc6504b1b
2012-11-14 14:46:57 +02:00
Joe Malin
4422596ddb am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit 'ce37f1da3619dcb4e53ca014cf4a17885cc3af0f':
  Notification.java javadoc: addAction
2012-11-13 14:25:09 -08:00
Joe Malin
ce37f1da36 am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '4979a0b59486d737a4d9267af9b38f237705e26f':
  Notification.java javadoc: addAction
2012-11-13 14:22:58 -08:00
Joe Malin
4979a0b594 am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '5f32d3375b13e581d3101ed8e928fd6a463f3809':
  Notification.java javadoc: addAction
2012-11-13 14:20:54 -08:00
Joe Malin
5f32d3375b Merge "Notification.java javadoc: addAction" into jb-dev-docs 2012-11-13 14:14:23 -08:00
Joe Fernandez
9b703463eb Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev 2012-11-13 13:36:01 -08:00
Joe Fernandez
3bdf4b6ca5 docs: Update platform version page with 4.2 release
Change-Id: I98f8090a8cf8100584a428c407374d7188d1f42b
2012-11-13 12:31:57 -08:00
Scott Main
f20b146fff Merge "docs: add ndk tos wall" into jb-mr1-dev 2012-11-13 11:41:14 -08:00
Scott Main
66e642b6d0 docs: add ndk tos wall
Change-Id: Ic7338d7d3606a017c84ce9895dfe68f2b931d182
2012-11-13 11:24:35 -08:00
Dirk Dougherty
c178ebe719 Merge "Doc change: update image for landing page." into jb-mr1-dev 2012-11-13 09:23:50 -08:00
Dirk Dougherty
b5e15cab4b Doc change: update image for landing page.
Change-Id: I8e88b3972c5597e0510b94938572b7219eecba46
2012-11-13 09:21:00 -08:00