Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,195 Commits 3 Branches 0 Tags
bd20bf7b80b115bf64d892f52c2c9c21f8a3cd64
Commit Graph

168195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
bd20bf7b80 am 7658f0ed: Merge "Teach bmgr that "android" is a valid package name" into lmp-mr1-dev 
automerge: e5e43e9

* commit 'e5e43e9ab88bf6a9951a323ae5f804967dab4c96':
  Teach bmgr that "android" is a valid package name
 2014-11-15 01:24:30 +00:00
Geoff Mendal
d083d20bde am 9004fe9a: (-s ours) Import translations. DO NOT MERGE 
automerge: 712608d  -s ours

* commit '712608d356b5a7b1f4e0cb9a955009a70e7f7a2a':
  Import translations. DO NOT MERGE
 2014-11-15 01:22:53 +00:00
Winson Chung
46695cf934 am 1c903b4e: Merge "Fixing regression in screen pinning button visibility. (Bug 18390050)" into lmp-mr1-dev 
automerge: 0d539c2

* commit '0d539c295613442a7926a2c3505a2834ab2b086c':
  Fixing regression in screen pinning button visibility. (Bug 18390050)
 2014-11-15 01:20:17 +00:00
Christopher Tate
e5e43e9ab8 am 7658f0ed: Merge "Teach bmgr that "android" is a valid package name" into lmp-mr1-dev 
* commit '7658f0edefab392b2af13b6558d08385c9b3ed5a':
  Teach bmgr that "android" is a valid package name
 2014-11-15 00:52:35 +00:00
Christopher Tate
7658f0edef Merge "Teach bmgr that "android" is a valid package name" into lmp-mr1-dev 2014-11-15 00:48:16 +00:00
Geoff Mendal
712608d356 am 9004fe9a: (-s ours) Import translations. DO NOT MERGE 
* commit '9004fe9a550b40f0cbba8823daac69d86477356e':
  Import translations. DO NOT MERGE
 2014-11-15 00:06:32 +00:00
Geoff Mendal
9004fe9a55 Import translations. DO NOT MERGE 
Change-Id: I629815c2db7019af69cf0660de6f791b2d8105cd
Auto-generated-cl: translation import
 2014-11-14 15:52:54 -08:00
Winson Chung
0d539c2956 am 1c903b4e: Merge "Fixing regression in screen pinning button visibility. (Bug 18390050)" into lmp-mr1-dev 
* commit '1c903b4e110a60da115acf6f94cdc50fd9e6cd62':
  Fixing regression in screen pinning button visibility. (Bug 18390050)
 2014-11-14 23:34:07 +00:00
Winson Chung
1c903b4e11 Merge "Fixing regression in screen pinning button visibility. (Bug 18390050)" into lmp-mr1-dev 2014-11-14 23:30:37 +00:00
Jinsuk Kim
f1faf93094 am 553aeed9: Merge "CEC: Buffer messages coming from unknown device" into lmp-mr1-dev 
automerge: cccafac

* commit 'cccafac36c7c0297afbfb17d4389951b77066cab':
  CEC: Buffer messages coming from unknown device
 2014-11-14 23:13:22 +00:00
John Reck
ff0c4856f4 am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev 
automerge: f1812b1

* commit 'f1812b17bb3396a28f3be8d19e0086de2be613a6':
  Document that circular reveal is async
 2014-11-14 22:58:50 +00:00
Yuncheol Heo
376dee63f3 am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev 
automerge: cde2617

* commit 'cde261796b3b38e05380ba186cb78350f83e2d30':
  CEC: Fix a bug in HdmiPortInfo.createFromParcel().
 2014-11-14 22:57:33 +00:00
John Spurlock
ec74a7e725 am 8fe10b4b: Merge "Volume: Move "Muted by" string from sysui to frameworks." into lmp-mr1-dev 
automerge: 8f84f62

* commit '8f84f62d1f296f78dcf50b9b4c22adb738b4b82a':
  Volume: Move "Muted by" string from sysui to frameworks.
 2014-11-14 22:56:34 +00:00
Jinsuk Kim
cccafac36c am 553aeed9: Merge "CEC: Buffer messages coming from unknown device" into lmp-mr1-dev 
* commit '553aeed9c9de19fcadb5466b39b6903eac61598b':
  CEC: Buffer messages coming from unknown device
 2014-11-14 22:56:26 +00:00
Jinsuk Kim
553aeed9c9 Merge "CEC: Buffer messages coming from unknown device" into lmp-mr1-dev 2014-11-14 22:52:57 +00:00
John Reck
f1812b17bb am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev 
* commit '8f5839be21f028885b6171e75cba479a020a3a0c':
  Document that circular reveal is async
 2014-11-14 22:07:29 +00:00
John Reck
8f5839be21 Merge "Document that circular reveal is async" into lmp-mr1-dev 2014-11-14 22:03:33 +00:00
John Reck
a3b35907de Document that circular reveal is async 
Bug: 18058966
Change-Id: I64b35441f12bec433f633580319ec73c1e11e7a2
 2014-11-14 14:02:55 -08:00
Yuncheol Heo
cde261796b am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev 
* commit '8977c1dab572cb61ebff1f844a549f7fb2e4e590':
  CEC: Fix a bug in HdmiPortInfo.createFromParcel().
 2014-11-14 21:55:43 +00:00
Jeff Sharkey
643e8ebca3 am 84998e28: Merge "Reduce spammy PackageManager critical logs." into lmp-mr1-dev 
automerge: adb5def

* commit 'adb5defbd9e27b546c25886046f1977d856509da':
  Reduce spammy PackageManager critical logs.
 2014-11-14 21:55:38 +00:00
Jeff Sharkey
9fb00cb428 am 17fe99ac: Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-dev 
automerge: bec816a

* commit 'bec816adc7dbbc23a04156e2aefeec9d0cb92077':
  Fix NPE in DropBoxManagerService.dump()
 2014-11-14 21:54:34 +00:00
Raph Levien
7010d0b6c3 am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 
automerge: 58fa003

* commit '58fa0035775bbb897115bae1b59719391a1a7edd':
  Check bounds on CharSequence drawText methods
 2014-11-14 21:53:11 +00:00
Raph Levien
c047ca4540 am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev 
automerge: fbe0e8f

* commit 'fbe0e8f4183f3a42fde9aeeed024bee2fbf182b6':
  Update hint text color even when text present
 2014-11-14 21:51:44 +00:00
Raph Levien
2d20850525 am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev 
automerge: be1ad50

* commit 'be1ad50b34e160c5d490d1165a590eb4c633d996':
  Fudge clipRect in TextView for extra cursor width
 2014-11-14 21:50:37 +00:00
Yuncheol Heo
8977c1dab5 Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev 2014-11-14 21:50:21 +00:00
Jeff Sharkey
b536c7a693 am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev 
automerge: 47d2c97

* commit '47d2c97e7084a676fe2b4d96683912279046b28c':
  Block loading WebView in privileged processes.
 2014-11-14 21:47:17 +00:00
smain@google.com
90610df227 am 03dd6845: am 04b393a8: am d35b8587: am 5e5af93b: remove preview system image links bug: 18376658 
automerge: 55c741a

* commit '55c741a7360fcf66fb295b127a48feb73cab97f6':
  remove preview system image links bug: 18376658
 2014-11-14 21:45:25 +00:00
John Spurlock
8f84f62d1f am 8fe10b4b: Merge "Volume: Move "Muted by" string from sysui to frameworks." into lmp-mr1-dev 
* commit '8fe10b4b04447d997179604ead942fd4bbd5eef2':
  Volume: Move "Muted by" string from sysui to frameworks.
 2014-11-14 21:44:52 +00:00
Yin-Chia Yeh
19e1512dca am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev 
automerge: 46810bf

* commit '46810bf2002b89ed2ad90e000294011f928af12a':
  Camera: doc update for independent 3A
 2014-11-14 21:42:45 +00:00
John Spurlock
8fe10b4b04 Merge "Volume: Move "Muted by" string from sysui to frameworks." into lmp-mr1-dev 2014-11-14 21:41:43 +00:00
Eric Laurent
8c8b919564 am 99253d00: Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev 
automerge: 5ff6057

* commit '5ff6057bd32737c808f978eae6c100ffa24148d1':
  AudioRecorder read buffer overflow
 2014-11-14 21:41:15 +00:00
Winson Chung
c990660771 am 189457c9: Merge "Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946)" into lmp-mr1-dev 
automerge: 741a5b5

* commit '741a5b5a0264ecc445c4c56f6c42c921d76d3dde':
  Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946)
 2014-11-14 21:39:20 +00:00
Fyodor Kupolov
70b2de7c25 am 6dd9f86f: Merge "Added synchronization to handlePackagesChanged method" into lmp-mr1-dev 
automerge: a07bdda

* commit 'a07bdda0d4d859467f8c435161d00d2340f34e9d':
  Added synchronization to handlePackagesChanged method
 2014-11-14 21:36:35 +00:00
Ye Wen
fc40ecd0e6 am 8b69c28b: Merge "Delay connecting to MmsService until APIs are called for imms" into lmp-mr1-dev 
automerge: 58635a5

* commit '58635a571d89120e313015e1c09926fda17689f5':
  Delay connecting to MmsService until APIs are called for imms
 2014-11-14 21:34:42 +00:00
Jeff Sharkey
adb5defbd9 am 84998e28: Merge "Reduce spammy PackageManager critical logs." into lmp-mr1-dev 
* commit '84998e28584e44f69be06fc9fe7e77df182251eb':
  Reduce spammy PackageManager critical logs.
 2014-11-14 21:09:52 +00:00
Jeff Sharkey
bec816adc7 am 17fe99ac: Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-dev 
* commit '17fe99ac01b8b6648d3d703fec1b28a792832331':
  Fix NPE in DropBoxManagerService.dump()
 2014-11-14 21:09:47 +00:00
Jeff Sharkey
84998e2858 Merge "Reduce spammy PackageManager critical logs." into lmp-mr1-dev 2014-11-14 21:06:47 +00:00
Jeff Sharkey
17fe99ac01 Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-dev 2014-11-14 21:06:22 +00:00
Raph Levien
58fa003577 am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 
* commit '505ffe3633f45778e493e23ad8c163f09ed1dbb5':
  Check bounds on CharSequence drawText methods
 2014-11-14 20:56:46 +00:00
Raph Levien
fbe0e8f418 am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev 
* commit '25f7c4b99284cd1e118f50bd585e6534acfad7c4':
  Update hint text color even when text present
 2014-11-14 20:56:40 +00:00
Raph Levien
be1ad50b34 am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev 
* commit 'cda81f2ded39b53dd813071760ad235363292d52':
  Fudge clipRect in TextView for extra cursor width
 2014-11-14 20:56:35 +00:00
Raph Levien
505ffe3633 Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 2014-11-14 20:54:29 +00:00
Raph Levien
25f7c4b992 Merge "Update hint text color even when text present" into lmp-mr1-dev 2014-11-14 20:53:14 +00:00
Raph Levien
cda81f2ded Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev 2014-11-14 20:51:58 +00:00
Jeff Sharkey
aea5c6e33d Reduce spammy PackageManager critical logs. 
Bug: 18390552
Change-Id: I66e34e6ebf3f644f8585056b9701b7f4582d777e
 2014-11-14 11:41:18 -08:00
John Spurlock
96e7f0ed1a Volume: Move "Muted by" string from sysui to frameworks. 
To enable sharing with Settings.

Bug: 17461563
Change-Id: Icdb5f85eb4bcaa1ead7d77c1460e06ad3f0604d5
 2014-11-14 14:38:03 -05:00
Jeff Sharkey
47d2c97e70 am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev 
* commit '27936ad3a677509fab1174c7b6655c894f018143':
  Block loading WebView in privileged processes.
 2014-11-14 19:33:49 +00:00
Winson Chung
86677c9a51 Fixing regression in screen pinning button visibility. (Bug 18390050) 2014-11-14 11:30:53 -08:00
Jeff Sharkey
27936ad3a6 Merge "Block loading WebView in privileged processes." into lmp-mr1-dev 2014-11-14 19:24:53 +00:00
smain@google.com
55c741a736 am 03dd6845: am 04b393a8: am d35b8587: am 5e5af93b: remove preview system image links bug: 18376658 
* commit '03dd684564ee2ce552095affc88ddc9885231689':
  remove preview system image links bug: 18376658
 2014-11-14 19:13:47 +00:00