Dianne Hackborn
eda74be89a
am 59ba9856: Merge "Fix issue #5388352 : font size change back to normal"
...
* commit '59ba98565d82fe7542569d1dd0847b47f30655d6':
Fix issue #5388352 : font size change back to normal
2011-10-05 06:37:00 -07:00
Dianne Hackborn
59ba98565d
Merge "Fix issue #5388352 : font size change back to normal"
2011-10-04 18:35:19 -07:00
Dianne Hackborn
09e5b9daf3
Fix issue #5388352 : font size change back to normal
...
This is another place where we are messed up by the stupid default
Configuration having a 1.0 font scale. Argh.
Change-Id: Iaa2550d4edab92fb8a52f98fbb9fd8ef5fab94b5
2011-10-04 16:32:01 -07:00
Christopher Tate
e706cef1c5
am b5de5985: Merge "Add -nosystem flag to adb backup"
...
* commit 'b5de598554a97c557a3e0c20c28bbe5454164a6d':
Add -nosystem flag to adb backup
2011-10-04 16:18:24 -07:00
Christopher Tate
b5de598554
Merge "Add -nosystem flag to adb backup"
2011-10-04 16:16:11 -07:00
Christopher Tate
240c7d2d1f
Add -nosystem flag to adb backup
...
This makes it easy to back up everything that belongs to 3rd party apps, but
nothing that comes with the system per se. If any system packages are
explicitly named on the command line they will be included in the backup
even if -nosystem was passed. So, for example, this will back up all 3rd
party apps as well as system settings, but nothing else belonging to
system-deployed apps:
adb backup -all -nosystem com.android.provider.settings
Bug 5361503
Change-Id: Iebe04b7d7027ca58b9f55e8eb7f219d6cca69269
2011-10-04 15:35:00 -07:00
Jeff Sharkey
3b3f26abb6
am 50a2f8ea: Merge "Read iface stats from single proc file."
...
* commit '50a2f8ea9d855c58f589cfaa12235a742185021d':
Read iface stats from single proc file.
2011-10-04 13:53:41 -07:00
Jeff Sharkey
50a2f8ea9d
Merge "Read iface stats from single proc file."
2011-10-04 13:52:24 -07:00
Jeff Sharkey
ae2c181083
Read iface stats from single proc file.
...
When available, use single "iface_stat_all" file instead of reading
values from dozens of files scattered across proc. Tests to verify.
Bug: 5397840
Change-Id: I0247be518436c1f79b32c4b72216739f49a9e8cc
2011-10-04 13:22:39 -07:00
Jeff Sharkey
ba36487a48
am c58111b3: Merge "Track xtables summary, move tether stats, time."
...
* commit 'c58111b307018da66bc227ed5ca019f7d8143b9a':
Track xtables summary, move tether stats, time.
2011-10-04 13:13:55 -07:00
Jeff Sharkey
c58111b307
Merge "Track xtables summary, move tether stats, time."
2011-10-04 13:12:06 -07:00
Kenny Root
56eb64900d
am afb119c5: Merge "Add explicit mimetype for verifier calls"
...
* commit 'afb119c5e19fe74bc99fd7ad2c4bcc21612872a5':
Add explicit mimetype for verifier calls
2011-10-04 09:05:27 -07:00
Kenny Root
afb119c5e1
Merge "Add explicit mimetype for verifier calls"
2011-10-04 09:04:06 -07:00
Jeff Sharkey
905b5891d2
Track xtables summary, move tether stats, time.
...
Begin tracking xtables summary of data usage to compare with values
reported from /proc/net/dev. Roll tethering directly into UID stats
to trigger UID stats persisting when crossing threshold.
Include xtables summary and authoritative time in samples.
Bug: 5373561, 5397882, 5381980
Change-Id: Ib7945522caadfbe0864fdf391582dc820f4f371e
2011-10-03 17:21:05 -07:00
Kenny Root
a503a0f5d4
Add explicit mimetype for verifier calls
...
Change-Id: I29ffb216680aa24fd9ca3fb4d190038f6d724cb9
2011-10-03 14:46:10 -07:00
Irfan Sheriff
a6cbcf051a
am 774f9856: Merge "Remember wifi disable due to airplane"
...
* commit '774f9856d31d42741660c07d24a1bb86c754365e':
Remember wifi disable due to airplane
2011-10-03 13:57:46 -07:00
Irfan Sheriff
774f9856d3
Merge "Remember wifi disable due to airplane"
2011-10-03 13:53:42 -07:00
Irfan Sheriff
31b92e28a5
Remember wifi disable due to airplane
...
Add the wifi disabled due to airplane mode as a seperate settings so
that wifi is restored after a reboot when airplane mode is turned off
Bug: 5365718
Change-Id: I36a9694bbcacd5bb5f89498e4adc47c81e611da6
2011-10-03 12:13:20 -07:00
satok
81f4bde02e
am 4a553e3a: Prioritize the order of subtypes in method.xml for implicitly enabled subtypes
...
* commit '4a553e3a70d26fac5d7b7ec1142e0cabfdd66670':
Prioritize the order of subtypes in method.xml for implicitly enabled subtypes
2011-10-03 02:15:56 -07:00
satok
4a553e3a70
Prioritize the order of subtypes in method.xml for implicitly enabled subtypes
...
Bug: 5401115
Change-Id: I6d9229cd266e27b68a6b9a2892aabfba4fe4de00
2011-10-03 17:49:57 +09:00
repo sync
b95dc6834e
am 82afa6e6: Merge "Fix IPv6 on wifi"
...
* commit '82afa6e61e6e8df57b71096a9f07eda956442fec':
Fix IPv6 on wifi
2011-09-30 09:59:52 -07:00
repo sync
82afa6e61e
Merge "Fix IPv6 on wifi"
2011-09-30 09:57:36 -07:00
Kenny Root
6f85220da8
am 83a5926e: Merge "Add DUMP permission checks to services"
...
* commit '83a5926ee349a3daf33cd8efd21e312fc0b1621e':
Add DUMP permission checks to services
2011-09-30 08:58:46 -07:00
Kenny Root
83a5926ee3
Merge "Add DUMP permission checks to services"
2011-09-30 08:57:43 -07:00
satok
f92565be01
am 3e21c99f: Merge "Fix a logic to recconect IME in InputMethodManagerService"
...
* commit '3e21c99f10de1acdd373fbb166a7618bebfceba0':
Fix a logic to recconect IME in InputMethodManagerService
2011-09-30 05:46:43 -07:00
satok
d092245ed9
am 594cb476: Merge "Use user\'s settings for the spell check language instead of the system locale"
...
* commit '594cb476547b38098018e80b5f70935ff60d9551':
Use user's settings for the spell check language instead of the system locale
2011-09-30 05:46:41 -07:00
satok
3e21c99f10
Merge "Fix a logic to recconect IME in InputMethodManagerService"
2011-09-30 03:31:35 -07:00
satok
59b424c3b6
Fix a logic to recconect IME in InputMethodManagerService
...
Bug: 5380216
Change-Id: I7af67265eebbd28f002210d7ac90dd18f1858f66
2011-09-30 19:26:01 +09:00
satok
70deff4c10
Use user's settings for the spell check language instead of the system locale
...
Bug: 5390462
Change-Id: Ia2a3981cb93f451646debe5ee6b037313825cf9f
2011-09-30 17:49:40 +09:00
Mathias Agopian
1a91d7dfa4
am 7db6da40: Merge "improve hwc log output"
...
* commit '7db6da40495d8960dae422fba6a4957824f23c3f':
improve hwc log output
2011-09-29 18:11:44 -07:00
Mathias Agopian
7db6da4049
Merge "improve hwc log output"
2011-09-29 18:09:35 -07:00
Mathias Agopian
1f29cbe8f4
improve hwc log output
...
we now print the handle of each buffer
Change-Id: I70884ae458a9dcf10cfc403258d48eaa4618b7f4
2011-09-29 18:07:08 -07:00
Christopher Tate
e8f2dcaf43
am 86b73497: Merge "Enforce DUMP permission on BackupManagerService\'s dump() method"
...
* commit '86b734972d4290a5d7f4c724f7ed14bbe36641f9':
Enforce DUMP permission on BackupManagerService's dump() method
2011-09-29 17:30:39 -07:00
repo sync
7960d9f888
Fix IPv6 on wifi
...
Bug: 5388757
Change-Id: I3c8c776c26dad1daa9801d0455fde749c0206401
2011-09-29 16:59:01 -07:00
Christopher Tate
b8491bb75f
Enforce DUMP permission on BackupManagerService's dump() method
...
The text of the dumped output can potentially include an email address;
we don't want random code to be able to read it.
Bug 5389201
Change-Id: If84886357a36b7015878e4d72017abba83b4c511
2011-09-29 15:13:11 -07:00
Dima Zavin
b402b3a325
am 9d128701: am e8b7f4a2: eventhub: print debugginf info when removing device
...
* commit '9d1287019a5d020489a80ca2c5e6479757ac723f':
eventhub: print debugginf info when removing device
2011-09-29 14:08:46 -07:00
Dima Zavin
9d1287019a
am e8b7f4a2: eventhub: print debugginf info when removing device
...
* commit 'e8b7f4a20c43d8f55d0cf85a94363b764ba598b8':
eventhub: print debugginf info when removing device
2011-09-29 14:06:38 -07:00
Dima Zavin
e8b7f4a20c
eventhub: print debugginf info when removing device
...
Change-Id: I40bbbd3867e8c7ac7d6fb38e1c72432bb4963316
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-29 11:28:17 -07:00
Kenny Root
3abd75ba3a
Add DUMP permission checks to services
...
Some services have info that is not readily available any other way. Add
a permission check to those services.
Bug: 5389201
Change-Id: I5a9724ec89e1c11ef7813eeb52a6a05b3ea92af5
2011-09-29 11:04:15 -07:00
Lorenzo Colitti
ff41f17be8
am 805f43cd: Merge "Revert "Tell the resolver what protocols to use.""
...
* commit '805f43cd0daa1369ce3da7b617a4e3fe649f45ef':
Revert "Tell the resolver what protocols to use."
2011-09-29 10:53:49 -07:00
Lorenzo Colitti
c1358b240c
Revert "Tell the resolver what protocols to use."
...
Change Ife82a8d8 broke IPv6 on wifi. Change I4e3a69ea is
an alternate approach that does not require any framework
changes.
Bug: 5284168
Change-Id: Ib6e002aa23700adc71051cf6b76860545497dbf4
2011-09-28 23:07:03 -07:00
Dianne Hackborn
1fd6c33620
Fix issue #5312624 : Lock screen very flickery
...
The key thing was to fix isVisibleOrBehindKeyguardLw() so that it
wouldn't count a window as not visible if it was just currently
in the process of drawing due to an orientation change.
Also improve logic in deciding when to turn screen on to better ensure
the screen is in a stable state, in particular treating screen off
as a frozen screen and not allowing it to turn on until the
update of the screen due to any config change is done.
Change-Id: If82199f3773270b2d07f9c7de9da2dad8c7b28d7
2011-09-28 19:46:39 -07:00
Dianne Hackborn
6ea4da95d9
Fix issue #5242779 : Device not responding to touch on unlock screen
...
Rework how we decide when it is okay to turn on the screen by having
the policy call back to the power manager when it knows the lock screen
has been drawn.
Change-Id: Ie8f3f72111dcf7f168723e6dce24e0343b4afe5d
2011-09-28 19:46:34 -07:00
Jamie Gennis
bc04810c92
am feb158b3: Merge changes Ib302d79e,Ib4ee085f
...
* commit 'feb158b3cbd0dada89b0437c3e09699ba3f982de':
SurfaceFlinger: set layer names on SurfaceTextures
SurfaceTexture: add name support
2011-09-27 14:25:57 -07:00
Jamie Gennis
feb158b3cb
Merge changes Ib302d79e,Ib4ee085f
...
* changes:
SurfaceFlinger: set layer names on SurfaceTextures
SurfaceTexture: add name support
2011-09-27 14:24:09 -07:00
Eric Laurent
c00181bac0
am ab7ed38d: Merge "Fix issue 5373658: memory leak in AudioFlinger."
...
* commit 'ab7ed38d5fea82db64eb90bad9d4c646d61d15df':
Fix issue 5373658: memory leak in AudioFlinger.
2011-09-27 14:09:37 -07:00
Eric Laurent
ab7ed38d5f
Merge "Fix issue 5373658: memory leak in AudioFlinger."
2011-09-27 14:07:45 -07:00
Jamie Gennis
65511fb43a
am d7b3c647: am da42e0fa: Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
...
* commit 'd7b3c6471773191c2f60dd38bf106cebe45a94e5':
SurfaceFlinger: fix setting default buffer size
2011-09-27 12:35:04 -07:00
Jamie Gennis
d7b3c64717
am da42e0fa: Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
...
* commit 'da42e0faaa95c796dc49f3b38023562dab6584a7':
SurfaceFlinger: fix setting default buffer size
2011-09-27 12:32:17 -07:00
Jamie Gennis
da42e0faaa
Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
2011-09-27 12:28:59 -07:00