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

153781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
f23e3ea629 am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit 'aeef612f200b6b5cee214230271e1c3d718151ee':
  Search all packages for a given type string when looking up resources by name
 2014-10-09 19:30:31 +00:00
Dianne Hackborn
0e259ce2d7 am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '6166a824b2ea7b7918f54769005ab691e15f77f7':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-09 19:30:26 +00:00
Jorim Jaggi
fc779ccf86 am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev 
* commit '01f1c5c85476b7eee3155ac1a1f6b570582ecd6c':
  Fix content description for bluetooth icon
 2014-10-09 19:30:16 +00:00
Joe Fernandez
487e15b901 am 401418d5: Merge "Revert "Removed preview license."" into lmp-dev 
* commit '401418d53b699e6cde53e45fba066c933868b6c1':
  Revert "Removed preview license."
 2014-10-09 19:30:00 +00:00
Sandeep Siddhartha
eecf74bcf7 am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'ed65c63bdc4a4413da5195f7e5fa392ce72f6135':
  Add tests for model management [SDK Only]
 2014-10-09 19:29:55 +00:00
Etan Cohen
4354e6046e am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit '5e5bc4b13cd1fc657da940c14e2333d8d3b18080':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-09 19:29:43 +00:00
Robin Lee
4a718f2af3 am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit 'a300025d23fac899c2294a8281b12b52d4e830b6':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:11:29 +00:00
Joe Fernandez
5b349c4ce9 am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'e2f757d9f3341b66d75d335cd9dd29848a4b8969':
  docs: Android TV publishing requirements
 2014-10-09 19:11:22 +00:00
Chong Zhang
d25b996a7a am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'a6ae8ba4a59f3f893fe8893335e7517388123c10':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:11:11 +00:00
Christopher Tate
f857b272c2 am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit '2e0f66820e12bbd24f476fba863d9dab564c6f97':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-09 19:11:06 +00:00
Fred Fettinger
708206c35e am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit '6c858c25f31bcdd72b60cbd0c91b085d9f298ffa':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-09 19:09:50 +00:00
mike dooley
3175824a78 am 879142bf: Fix hangouts conference calling regression. 
* commit '879142bf1c6b72670d4aedac82938f00a97acf5b':
  Fix hangouts conference calling regression.
 2014-10-09 19:09:41 +00:00
Tim Kilbourn
5d7f58be2c am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '37bd07768a05aabb0905608606f354a488a2d5cf':
  Don't start SearchDialog on television.
 2014-10-09 19:09:30 +00:00
Jeff Brown
ab46eda872 am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit '704998abbafea84c28c0bcd0c540af87562b4cc9':
  Ensure we correctly unblank displays when added.
 2014-10-09 19:09:01 +00:00
smain@google.com
8433b63c02 am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit 'b880707c7facd8f9232379ef481b2b5a0030b682':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 19:08:56 +00:00
smain@google.com
3ae2a71539 am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit '9f928944fa4186e97b051b0076d7e30469b92124':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-09 19:08:41 +00:00
Christopher Tate
b03b6a6c5a am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit '6dea8de7097eb91c9595cea63acd489e34c63aac':
  Actually tell the widget service that restore is starting
 2014-10-09 19:08:33 +00:00
Adam Lesinski
aeef612f20 Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 2014-10-09 19:02:24 +00:00
Dianne Hackborn
6166a824b2 Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 2014-10-09 19:00:12 +00:00
Jorim Jaggi
01f1c5c854 Merge "Fix content description for bluetooth icon" into lmp-dev 2014-10-09 18:29:36 +00:00
Adam Lesinski
e60a87f552 Search all packages for a given type string when looking up resources by name 
Previously we would stop at the first match when looking for a type string,
but we should search all packages in case a feature Split added a type
with the same name.

Bug:17924027

Change-Id: I6bc7ef073324db99448538cd8bdf566658f066ff
 2014-10-09 11:26:19 -07:00
Joe Fernandez
401418d53b Merge "Revert "Removed preview license."" into lmp-dev 2014-10-09 18:03:21 +00:00
Joe Fernandez
5c07e40436 Revert "Removed preview license." 
New plan: We need this for the Device Preview images provided on the final L-Preview page. 

This reverts commit 4974e7f27cf93842001c10379c0be0b24eb035d7.

Change-Id: I1b5fd6d58c53c6ac14f86c688eaea540d683134a
 2014-10-09 18:02:10 +00:00
Sandeep Siddhartha
ed65c63bdc Merge "Add tests for model management [SDK Only]" into lmp-dev 2014-10-09 17:54:16 +00:00
Jorim Jaggi
2d75f9fd17 Fix content description for bluetooth icon 
Bug: 17921584
Change-Id: I908d31aaa15188baffee76933a3025bad6bc2631
 2014-10-09 10:43:52 -07:00
Dianne Hackborn
fdf5b35ab4 Implement issue #17906468: Allow search request to fall back to global search 
Change-Id: I04834b2a9f1ec4a68c6a3fed14da2f8dd93b3be7
 2014-10-09 10:37:19 -07:00
Etan Cohen
5e5bc4b13c TD_SCDMA is more like GSM than CDMA - re-classifying. 
Bug: 17788412
Change-Id: Icc6a692a1f038624dde772f8d8f197aab604c166
 2014-10-09 16:58:04 +00:00
RoboErik
f91222327e am a78601dc: Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev 
* commit 'a78601dc1929428007fdbb07da0a07ae3fb60bd5':
  Ensure metadata bundles are unparceled before making them available
 2014-10-09 16:46:46 +00:00
Christopher Tate
3a8e28c1d7 am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev 
* commit 'c0a30bcfaecf38ab5b55c53e82505570ffffa71e':
  Turn on dimension validation in wallpaper restore
 2014-10-09 16:46:36 +00:00
Georgi Nikolov
682d77dcf1 am 6eb0f480: Merge "BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev 
* commit '6eb0f4808dd984a7fa45da5eca03b4c5d8ff9327':
  BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler
 2014-10-09 16:46:26 +00:00
Ye Wen
108ba84ac5 am de73afe2: Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev 
* commit 'de73afe268bd7979017ae4b9481fc1ebf5df6c19':
  Make MmsServiceBroker more robust to MmsService crashes
 2014-10-09 16:46:19 +00:00
Adam Lesinski
6167950b7a am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-09 16:46:14 +00:00
Robin Lee
a300025d23 Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 2014-10-09 12:55:17 +00:00
Joe Fernandez
e2f757d9f3 am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'a63f81ec897988befad7b286b50f73a42319fd5e':
  docs: Android TV publishing requirements
 2014-10-09 12:07:07 +00:00
Joe Fernandez
a63f81ec89 am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'e15773be4837baf15079d5d7e8f8c0c09cef952f':
  docs: Android TV publishing requirements
 2014-10-09 12:01:36 +00:00
Robin Lee
d0130e8539 DevicePolicy: One cert tracker warning per profile 
Shows one notification per profile instead of one notification per
user or (previously) one notification per device.

Bug: 17794425
Change-Id: I6f0d34a16fa2a45082941387ac765dd99eefa131
 2014-10-09 12:46:13 +01:00
Joe Fernandez
e15773be48 Merge "docs: Android TV publishing requirements" into klp-modular-docs 2014-10-09 04:19:20 +00:00
Joe Fernandez
1b361d90d3 docs: Android TV publishing requirements 
Change-Id: If1105cb596934034a7156b573c99905bbe6c4978
 2014-10-08 20:56:32 -07:00
Geoff Mendal
e73bb6e059 am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '49c5ddd67793735a2d6fc036614cdfab944d56f6':
  Import translations. DO NOT MERGE
 2014-10-09 03:06:49 +00:00
Quddus Chong
10be6fed66 am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '8f25f390e515be9783e8cce913f8de051e097419':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-09 03:03:14 +00:00
Mike Lockwood
cf61b3f6e6 am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 
* commit '3910f53c5ebccbe64ab768591dc7c377f1eb0153':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
 2014-10-09 03:03:09 +00:00
Eino-Ville Talvala
eeec4b9ebc am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit 'ef773e3569969592fb220b7ccc49dafcabfdd67a':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-09 03:02:35 +00:00
Chong Zhang
a6ae8ba4a5 MediaHTTPConnection: do not use proxy for localhost 
Bug: 17681512
Change-Id: Iba25d89636d8f96efc0eb90e0dd7a135c82ff16a
 2014-10-09 02:07:40 +00:00
Christopher Tate
2e0f66820e Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 2014-10-09 02:04:02 +00:00
Christopher Tate
da058e260d Also monitor MOVED_TO events for wallpaper updates 
Restore uses moveTo(), not open/write/close, so we need
to watch for that as well.  Now the wallpaper service sees
and regenerates the wallpaper image immediately upon restore.

Bug 17909454

Change-Id: I0db224c3d507bdc40399d49bb4bea01899f76ad1
 2014-10-08 18:57:48 -07:00
Fred Fettinger
6c858c25f3 am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit 'b4093c12f8a8cf73f869419904c60e953f5725ee':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-09 01:23:59 +00:00
mike dooley
879142bf1c Fix hangouts conference calling regression. 
Check the connection-by-id hash table instead of conference-by-id hash
table when setting conferenceable connections.

Bug: 17919110
Change-Id: Ia8a5ab3fb96926e600d21eca7737a0044b233563
 2014-10-09 01:15:58 +00:00
Fred Fettinger
b4093c12f8 hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
Cherry-picked into klp-modular-dev.

bug:17441218

GLConsumer uses glBindTexture() directly instead of going through
Caches::bindTexture(). This can cause libhwui to draw with the wrong
texture bound in the following case which involves 2 TextureViews:

Frame 1:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
HWUI renders TextureView A:
    calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws

Frame 2:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 2)
HWUI renders TextureView A:
    calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
HWUI renders TextureView B:
    calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 2) and draws

In this case, HWUI will incorrectly draw TextureView A using texture 2 on
frame 2, because mBoundTextures[0]=1, even though the texture currently
bound to GL_TEXTURE_EXTERNAL_OES is 2.

Since GLConsumer is always used with a target of GL_TEXTURE_EXTERNAL_OES,
work around this problem by having mBoundTextures[] store only the
textures bound to the target GL_TEXTURE_2D. This is the common case
where the extra performance is needed. Since it's legal to have
different textures bound to GL_TEXTURE_2D and GL_TEXTURE_EXTERNAL_OES
on one texture unit, Caches::bindTexture() does not need to clear
mBoundTextures[mTextureUnit] when target != GL_TEXTURE_2D.

Change-Id: I8bc54ab8adcfacad7f3ed17a31236dc7a86c967a
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
(cherry picked from commit e4de36bbc2baf13206deb53ced39f0befadb1861)
 2014-10-09 00:57:17 +00:00
Tim Kilbourn
37bd07768a Merge "Don't start SearchDialog on television." into lmp-dev 2014-10-09 00:49:36 +00:00
Svetoslav
2f2864b7b1 am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev 
* commit '3dd06d9005bd572a3b012b3a2b27adfa94533144':
  Restored widget provider id not properly updated.
 2014-10-09 00:15:02 +00:00