drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,696 Commits 1 Branch 0 Tags
Commit Graph

117696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
afc76f28b9 Merge "Use scaled display size in wallpaper constraint." into klp-dev 2013-11-18 20:49:16 +00:00
Adam Lesinski
2cd3fb5aa7 Do not hold direct ref BatteryStatsImpl$Uid$Proc 
BatteryStatsImpl can reset its collected data, including
removing a BatteryStatsImpl$Uid$Proc object. If a ProcessRecord
has a direct reference, then the battery stats for a process
will be recorded in an old Proc object and prevent GC, causing
a memory leak.

bug:11087238
Change-Id: I19a9cd9d8361c10446a8ebdd5c0860b56c442209
 2013-11-18 12:29:34 -08:00
John Spurlock
d6e836c4a0 Use scaled display size in wallpaper constraint. 
Bug:11596190
Change-Id: Icc81beeea2e71144c2e5330b047e4781a23d7449
 2013-11-18 14:14:49 -05:00
Baligh Uddin
1dc93acf3a am 4dee4e1c: (-s ours) am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4dee4e1cb394b077174ee29656bde962502555de':
  Import translations. DO NOT MERGE
 2013-11-18 10:56:21 -08:00
Baligh Uddin
0076f4ac0f am 2cf27e71: (-s ours) am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2cf27e711196c3c8fdf8ed14e283bd6a08b7fde5':
  Import translations. DO NOT MERGE
 2013-11-18 10:56:17 -08:00
Baligh Uddin
4dee4e1cb3 am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '35fb6cdf14549dac07585ae791b27e2c069bf176':
  Import translations. DO NOT MERGE
 2013-11-18 10:53:25 -08:00
Baligh Uddin
2cf27e7111 am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd7b4052049cba6c793367f6b5a8c3837f06faf1e':
  Import translations. DO NOT MERGE
 2013-11-18 10:53:21 -08:00
Baligh Uddin
35fb6cdf14 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-18 18:51:24 +00:00
Baligh Uddin
d7b4052049 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-18 18:51:01 +00:00
Robert Greenwalt
51213d943b am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev 
* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
  Fix NPE in ConnectivityService
 2013-11-18 10:33:46 -08:00
Robert Greenwalt
a8a448da25 am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev 
* commit 'e568672c9e57e1d7066e95ba547a1ae568409226':
  Fix NPE in ConnectivityService
 2013-11-18 10:29:51 -08:00
Robert Greenwalt
e568672c9e Merge "Fix NPE in ConnectivityService" into klp-dev 2013-11-18 18:27:23 +00:00
Deepanshu Gupta
5b95025059 am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev 
* commit 'ea04da7a183b526cdc79366822e4fc794d28cbd2':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE
 2013-11-18 10:15:44 -08:00
Deepanshu Gupta
f6ee080570 am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev 
* commit '42453ede3335aa5f7007a5b36749e84df83a08d4':
  Fix NPE in layoutlib. DO NOT MERGE
 2013-11-18 10:15:40 -08:00
Deepanshu Gupta
ea04da7a18 am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev 
* commit '9570ed561296dd5a0753198706cde152b00f1b24':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE
 2013-11-18 10:11:50 -08:00
Deepanshu Gupta
42453ede33 am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev 
* commit '599105a92ceb24f0f09beb11be18126ae4e8efdf':
  Fix NPE in layoutlib. DO NOT MERGE
 2013-11-18 10:11:47 -08:00
Deepanshu Gupta
9570ed5612 Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev 2013-11-18 18:08:09 +00:00
Deepanshu Gupta
599105a92c Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev 2013-11-18 18:07:55 +00:00
Robert Greenwalt
a8dae99d76 Fix NPE in ConnectivityService 
bug:11727708
Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a
 2013-11-18 09:43:59 -08:00
Baligh Uddin
4f0d1fc028 Import translations. DO NOT MERGE 
Change-Id: Iacdab3a03a17cefc52aa7d72195d0cbcc2354039
Auto-generated-cl: translation import
 2013-11-18 09:22:29 -08:00
Baligh Uddin
2337eb1b65 Import translations. DO NOT MERGE 
Change-Id: Ia6d256fedf7e3d888942d66397f5842d46658c0f
Auto-generated-cl: translation import
 2013-11-18 08:49:48 -08:00
Baligh Uddin
ce21c69b2a am 253a352f: (-s ours) am 564fb1b8: (-s ours) Import translations. DO NOT MERGE 
* commit '253a352f8c351201781fe5e677ddc588b3527a95':
  Import translations. DO NOT MERGE
 2013-11-17 16:38:53 -08:00
Baligh Uddin
253a352f8c am 564fb1b8: (-s ours) Import translations. DO NOT MERGE 
* commit '564fb1b8ce4aa603bd0d5b3a077ba27d66e77c32':
  Import translations. DO NOT MERGE
 2013-11-17 16:35:05 -08:00
Baligh Uddin
564fb1b8ce Import translations. DO NOT MERGE 
Change-Id: I6eea0f5a4b57c4686d1f6ff4fc137358400651b8
Auto-generated-cl: translation import
 2013-11-17 16:30:52 -08:00
Craig Mautner
427dcdffc2 am 0324bb1a: am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev 
* commit '0324bb1a9972ec766b65d4b47b9688588633967b':
  Restore jankless transition keyguard-to-wallpaper
 2013-11-15 15:26:03 -08:00
Craig Mautner
0324bb1a99 am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev 
* commit '23188c2be4abb23f506b01ccd99884debd09cbb6':
  Restore jankless transition keyguard-to-wallpaper
 2013-11-15 15:20:18 -08:00
Craig Mautner
23188c2be4 Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev 2013-11-15 23:13:48 +00:00
Katie McCormick
1e5af1bcfa am 0037930b: am 63cd3802: Doc update: update old console references. 
* commit '0037930bbea46ee9a818ff8e66bf7f334e467420':
  Doc update: update old console references.
 2013-11-15 14:45:07 -08:00
Katie McCormick
0037930bbe am 63cd3802: Doc update: update old console references. 
* commit '63cd3802008010008aebc3a7a5d9fdf432cf0b5a':
  Doc update: update old console references.
 2013-11-15 22:39:21 +00:00
Katie McCormick
63cd380200 Doc update: update old console references. 
Change-Id: I54d50876022b308a4688293853b3e9227cb5e87c
 2013-11-15 22:33:13 +00:00
Craig Mautner
de43ebe86a Restore jankless transition keyguard-to-wallpaper 
There is still a flash of black when going to a non-wallpaper activity
from keyguard. This is not a regression from jb-mr2 and any fixes to
clean it up are too risky at this late date.

Fixes (partially) bug 11570753.

Change-Id: I17aaae4ab8be570f7e28276a7b8ac4b8685e7551
 2013-11-15 14:15:43 -08:00
Joe Fernandez
21be773432 am 33164786: am 5b93d259: Merge "docs: code fixes for OpenGL ES training" into klp-docs 
* commit '331647865554b5fe49d936452fed4dc1d86d7313':
  docs: code fixes for OpenGL ES training
 2013-11-15 13:26:22 -08:00
Joe Fernandez
3316478655 am 5b93d259: Merge "docs: code fixes for OpenGL ES training" into klp-docs 
* commit '5b93d259b8df98b011ac7f915b2c6602bc63f9fe':
  docs: code fixes for OpenGL ES training
 2013-11-15 21:22:17 +00:00
Joe Fernandez
5b93d259b8 Merge "docs: code fixes for OpenGL ES training" into klp-docs 2013-11-15 21:19:51 +00:00
Joe Fernandez
feaaea5b41 docs: code fixes for OpenGL ES training 
code sample fixes reviewed separately,
see Change-Id: I1d760b75d1f2bfe1ec90c71471867577bd146241

fixing bugs:
b/10798358
b/10796990
b/10603728
b/7962328

Change-Id: I1e0f6668ec8d2b103b88c385f1f067d30ecc7178
 2013-11-15 11:55:33 -08:00
Wink Saville
044bc25fb5 am 67979256: am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev 
* commit '67979256865f63330a1352e450e26baf24e914ec':
  Add config_restartRadioAfterProvisioning
 2013-11-15 11:42:55 -08:00
Wink Saville
6797925686 am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev 
* commit '31cab2f803951edb13ea07e7e34916189fec5167':
  Add config_restartRadioAfterProvisioning
 2013-11-15 11:39:16 -08:00
Wink Saville
31cab2f803 Merge "Add config_restartRadioAfterProvisioning" into klp-dev 2013-11-15 19:35:05 +00:00
Wink Saville
9124d56acc Add config_restartRadioAfterProvisioning 
Bug: 11673637
Change-Id: Ie758a303fd751d204fd6baa60217e88df6376aae
 2013-11-15 08:27:53 -08:00
Jeff Brown
2ea480cac8 am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev 
* commit '5d0b18cddfcb933d7960c5a6a820045d77a0285c':
  Disallow applications from initiating cast screen.
 2013-11-15 00:39:57 -08:00
Jeff Brown
5d0b18cddf am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev 
* commit '3de885bef2f0f85ea76fd96c8f18cdd743ce66a4':
  Disallow applications from initiating cast screen.
 2013-11-15 00:38:09 -08:00
Jeff Brown
3de885bef2 Merge "Disallow applications from initiating cast screen." into klp-dev 2013-11-15 08:35:50 +00:00
Jeff Brown
af574183c2 Disallow applications from initiating cast screen. 
Only allow the system ui and settings to connect to a remote display.
To do this, we essentially hide the remote displays from applications
by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks
around the operations that connect to them.

As a bonus, this may actually save power on devices since applications
that use MediaRouter will not longer be performing discover on
remote display routes at all.

Bug: 11257292
Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
 2013-11-15 00:29:43 -08:00
Baligh Uddin
2b9f9186fa am 634fbcf8: (-s ours) am 2785892d: (-s ours) Import translations. DO NOT MERGE 
* commit '634fbcf8a3a367ef0abbc7a905411c7918281394':
  Import translations. DO NOT MERGE
 2013-11-14 22:43:42 -08:00
Baligh Uddin
634fbcf8a3 am 2785892d: (-s ours) Import translations. DO NOT MERGE 
* commit '2785892dbf6c53b7e1a08596969bfcdf0148c8e9':
  Import translations. DO NOT MERGE
 2013-11-14 22:39:20 -08:00
Baligh Uddin
2785892dbf Import translations. DO NOT MERGE 
Change-Id: I6d1283da139ad2ef60213d83d7ac00939a4bfc04
Auto-generated-cl: translation import
 2013-11-14 22:32:08 -08:00
Svetoslav
172c5a2473 am d2b27cbd: am 6874bfe1: Merge "Created print jobs should not be persisted until they are queued." into klp-dev 
* commit 'd2b27cbde92dc57b5b6fe9b7434a5189a73dd2b2':
  Created print jobs should not be persisted until they are queued.
 2013-11-14 22:30:52 -08:00
Svetoslav
d2b27cbde9 am 6874bfe1: Merge "Created print jobs should not be persisted until they are queued." into klp-dev 
* commit '6874bfe19b6bc1522e07e53eb96a07e21d148b41':
  Created print jobs should not be persisted until they are queued.
 2013-11-14 22:27:35 -08:00
Svetoslav
6874bfe19b Merge "Created print jobs should not be persisted until they are queued." into klp-dev 2013-11-15 06:23:32 +00:00
Jianzheng Zhou
a363a10ca2 fix ethernet and wifi can't be tuned seperately issue 
ethernet especially Gigabit enet use the same tune data with wifi
won't reach best performance.

Change-Id: Iac50ba47904c76ff7b5b8ad226e83451359ec534
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
 2013-11-15 13:32:23 +08:00