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

173346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
d3403e45d6 am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'faf92d725649337a29312603dc8c10a3f0ee103a':
  Import translations. DO NOT MERGE
 2015-01-15 23:45:54 +00:00
Geoff Mendal
faf92d7256 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-15 23:39:49 +00:00
Craig Mautner
b523c55d76 am 41d54237: am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '41d54237380d5f3c06ab2a71715e22f048278ecf':
  Debug for bug 18201239.
 2015-01-15 23:30:41 +00:00
Craig Mautner
41d5423738 am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '92cf3608b8f171f84f74ab1f7193a6a816063d14':
  Debug for bug 18201239.
 2015-01-15 23:24:40 +00:00
Craig Mautner
92cf3608b8 Merge "Debug for bug 18201239." into lmp-mr1-dev 2015-01-15 23:18:40 +00:00
Chris Craik
04b633c526 am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 
* commit '0de2eca5fc439e2622cc0cc5a54cd9a5938f67c6':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
 2015-01-15 23:15:56 +00:00
Geoff Mendal
116f90c895 Import translations. DO NOT MERGE 
Change-Id: I4580b358133cd261985459a26a1c4bc36a14d630
Auto-generated-cl: translation import
 2015-01-15 15:14:15 -08:00
Chris Craik
0de2eca5fc am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 
* commit '112e35b4641a1a8cad3616c8209ab47f03f9ab67':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
 2015-01-15 23:08:11 +00:00
Chris Craik
112e35b464 Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 2015-01-15 23:04:15 +00:00
Craig Mautner
9776ad41b9 Debug for bug 18201239. 
Change-Id: I06281bd76b8c1d887324d3efa39b6cb11c9e71ae
 2015-01-15 14:38:39 -08:00
Alan Viverette
78dfb182d2 am dbe54533: am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit 'dbe54533499571f34ddc126ea21379932ea1d6d7':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:37:40 +00:00
Alan Viverette
dbe5453349 am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit '77e1f7a27bfdd040b00d7ec97440d3cb1e5b79a1':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:32:27 +00:00
Alan Viverette
77e1f7a27b Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 2015-01-15 22:25:08 +00:00
Eric Laurent
c3fb94caf0 am 4772f8b8: am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 
* commit '4772f8b841dc1ad50999e2cca3f1d366b325b915':
  AudioManager: make AudioPortEventHandler static
 2015-01-15 22:21:58 +00:00
Eric Laurent
4772f8b841 am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 
* commit '16cfa8ddfd6c18577f5d38e545597a63889d9779':
  AudioManager: make AudioPortEventHandler static
 2015-01-15 22:16:28 +00:00
Eric Laurent
16cfa8ddfd Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 2015-01-15 22:10:53 +00:00
Alan Viverette
03748a5707 Ensure scroll assets are drawn with correct opacity 
Bug: 18903443
Change-Id: I5a7e738b1a09c22857683e2540c96a050b82866e
 2015-01-15 13:00:21 -08:00
Eino-Ville Talvala
31028fa621 am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 
* commit '1334a6f34296094baddc0d4c0c93357532b2a96d':
  Camera: Clarify JNI exception message
 2015-01-15 20:13:11 +00:00
Eino-Ville Talvala
1334a6f342 am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 
* commit '8d47bc97e642cd0d0caf31d09efe05d8dc233f27':
  Camera: Clarify JNI exception message
 2015-01-15 20:06:34 +00:00
Eino-Ville Talvala
8d47bc97e6 Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 2015-01-15 20:00:02 +00:00
Luan Nguyen
34a1a10d51 am b47cf562: am e184b2f2: am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'b47cf562bbbc08e45a6ae38e1ae98a36e6928caf':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:47:32 +00:00
Luan Nguyen
b47cf562bb am e184b2f2: am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'e184b2f2355e572fa67e748e625e4eea0ac29201':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:42:21 +00:00
Luan Nguyen
e184b2f235 am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'd5a114cd0e15bdd263bfd9704bdfeacd28dfe670':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:36:35 +00:00
Luan Nguyen
d5a114cd0e am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'd3cc11a1647c2aa9d830c1538e6a3b1355c9ca1f':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:30:08 +00:00
Winson Chung
5675f01868 DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531) 
We can use our normal visibility check to dismiss Recents when the screen is off,
since the system broadcast can occur after the activity is stopped.  We should use
the same mechanism we use to test visibility when launching Recents and just see
if it is the top most activity.

Change-Id: Ib9c01e78fd9221c4fb0ffcc80a01a0c58fb96836
 2015-01-15 11:27:43 -08:00
Roozbeh Pournader
a601d44baa am a4d1e250: am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 
* commit 'a4d1e25000195b2349cb29e389d1ded4b23dc7a6':
  Fudge getRightPaddingOffset in TextView to match clipRect.
 2015-01-15 19:21:01 +00:00
Roozbeh Pournader
a4d1e25000 am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 
* commit '9787039d91ad23805a1e73e1cd973b85295b85c2':
  Fudge getRightPaddingOffset in TextView to match clipRect.
 2015-01-15 19:10:33 +00:00
Roozbeh Pournader
9787039d91 Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 2015-01-15 18:56:08 +00:00
Kenny Guy
212037f7cd Sync file before using JournaledFile commit. 
Ext4 doesn't guarantee that write file.new / close file.new
rename file.new to file will mean data in file.new makes it
to file atomically. The rename may happen with previous contents
of file.new and then later update to new contents
See docs for noauto_da_alloc
So rebooting the device during JournaledFile.commit may
mean we are left with an empty file.

Bug: 18590558
Change-Id: I35322c82871bed30c2c6ebbd1388338f0471f3ba
 2015-01-15 18:48:01 +00:00
Eric Laurent
f076db4070 AudioManager: make AudioPortEventHandler static 
Make AudioPortEventHandler and audio port and patch caches
static members of AudioManager. There is only one callback
per process in AudioSystem for audio port updates
and having those non static would not work when more than
one AudioManager instance exists in one app.

Bug: 18727023.
Change-Id: I4c1041dc6441d168be4efa066e14289cc5f41872
 2015-01-15 10:13:52 -08:00
Luan Nguyen
d3cc11a164 docs: Remove reference to handheld app for bitmap resource locations. 
bug: 17577838
Change-Id: I54cfd7a73d21464077d8644bbe1a2d8896f745e6
 2015-01-15 09:24:09 -08:00
Neil Fuller
60cf05c1b3 Removing HttpResponseCacheTest 
Moving HttpResponseCacheTest.java from
frameworks/base/core/tests/coretests/src/android/net/http
to
cts/tests/tests/net/src/android/net/http/cts

Change-Id: I61a07c53f8d0ef55d35b928f244e4680725b76ef
 2015-01-15 16:00:42 +00:00
Nicolas Prevot
97c1882719 am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 
* commit '97f1ac016b6c116dc2964ba60ffe1e405578756a':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
 2015-01-15 12:42:47 +00:00
Nicolas Prevot
97f1ac016b am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 
* commit 'a9f9c4b90a8af25974bc74971efeafa521073df2':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
 2015-01-15 12:35:05 +00:00
Nicolas Prevot
a9f9c4b90a Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 2015-01-15 12:28:13 +00:00
Narayan Kamath
19039a632b am 2f7ae528: am a747d5e4: Merge "Fix unexpected language changes on SIM card insertion." 
* commit '2f7ae528093ef4434e4d6380df0803cf70359971':
  Fix unexpected language changes on SIM card insertion.
 2015-01-15 12:09:48 +00:00
Narayan Kamath
2f7ae52809 am a747d5e4: Merge "Fix unexpected language changes on SIM card insertion." 
* commit 'a747d5e47bef27acd18afda3ed43309ad5fab87b':
  Fix unexpected language changes on SIM card insertion.
 2015-01-15 12:02:15 +00:00
Narayan Kamath
a747d5e47b Merge "Fix unexpected language changes on SIM card insertion." 2015-01-15 11:53:32 +00:00
Narayan Kamath
7dc8d32fd2 Fix unexpected language changes on SIM card insertion. 
There are two separate issues here that need to be fixed, both
boil down to the fact that adding an imperative (userSetLocale)
to the Configuration is a bad idea. Because of this:

- We'd never persist the first user set configuration if it was en_US,
  because of an erroneous call to Configuration.setLocale.

- ActivityManager.getConfiguration would sometimes return a
  Configuration with userSetLocale == true, which means callers with
  the right permissions would inadvertently persist a locale they didn't
  want to persist.

bug: 18879010

(cherry picked from commit c63a16b8e46f2f3ecce6c548663cc3185f011fd6)

Change-Id: I4d714eb1f75afc0a5bf4d53a374df4ed16e328bf
 2015-01-15 11:50:55 +00:00
Jinsuk Kim
b098c2dca4 am 5304649b: am 2cd3ac47: Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev 
* commit '5304649ba89c9ebdd792e83761f8f4098c6d6465':
  CEC: Support sendStandby() for MHL device
 2015-01-15 05:19:53 +00:00
Jinsuk Kim
5304649ba8 am 2cd3ac47: Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev 
* commit '2cd3ac4707f32fc296c0b2a8e7e2479d40c9a706':
  CEC: Support sendStandby() for MHL device
 2015-01-15 05:11:49 +00:00
Jinsuk Kim
2cd3ac4707 Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev 2015-01-15 05:07:04 +00:00
Brian Carlstrom
5baa164aec Restore write_delete_file 
Change-Id: Id93a59ae6c82f6068c58b22e2a651ff8a3b8f530
 2015-01-14 18:19:54 -08:00
Dianne Hackborn
fce232b408 am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 
* commit '5a4b4084215b1efc5308c0c914185599b4d502bf':
  Fix issue android-app doc, bump battery stats checkin version
 2015-01-15 01:52:21 +00:00
Dianne Hackborn
5a4b408421 am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 
* commit 'b96a6916f657c4b3f5da7a5d2d8d32dee4d6167c':
  Fix issue android-app doc, bump battery stats checkin version
 2015-01-15 01:42:35 +00:00
John Reck
cefeb34e48 am 2c9f86aa: am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-dev 
* commit '2c9f86aa21b8d7ea6a77eaca9a49ccdb31245129':
  Vsyncs are hard
 2015-01-15 01:39:50 +00:00
Alan Viverette
c83245be67 am 628e646e: am aa229902: Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev 
* commit '628e646eeae6147578428632d7c25326b8b7ef59':
  Jump ripples to end when switching to a non-hardware canvas
 2015-01-15 01:39:44 +00:00
Alan Viverette
da562f3d51 am cf1950aa: am 4490774b: Merge "Make the DatePicker dialog fit on smaller screens in landscape mode" into lmp-mr1-dev 
* commit 'cf1950aaabb50b4e851ce1c5fe6fde9f8c848473':
  Make the DatePicker dialog fit on smaller screens in landscape mode
 2015-01-15 01:39:37 +00:00
Christopher Tate
49138184de am 9568307c: am 43a4a8c7: Fix redundant file backups 
* commit '9568307cf32c8abc6703dc7a1b0b0fee56c4f8f5':
  Fix redundant file backups
 2015-01-15 01:39:29 +00:00
Dianne Hackborn
b96a6916f6 Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 2015-01-15 01:38:23 +00:00