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

173763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jinsuk Kim
36f3b81440 am f1faf930: am 553aeed9: Merge "CEC: Buffer messages coming from unknown device" into lmp-mr1-dev automerge: cccafac 
* commit 'f1faf93094c2e49782a3ba26c2d0e67b13199238':
  CEC: Buffer messages coming from unknown device
 2014-11-14 23:18:16 +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
eb4afaeedd am ff0c4856: am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev automerge: f1812b1 
* commit 'ff0c4856f4f912f483c8293a72657d82b1dd14a9':
  Document that circular reveal is async
 2014-11-14 23:05:36 +00:00
Yuncheol Heo
f946a522b7 am 376dee63: am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev automerge: cde2617 
* commit '376dee63f383d31f547a09d9708103592d9e0dd9':
  CEC: Fix a bug in HdmiPortInfo.createFromParcel().
 2014-11-14 23:01:05 +00:00
John Spurlock
c8782e4c2f am ec74a7e7: am 8fe10b4b: Merge "Volume: Move "Muted by" string from sysui to frameworks." into lmp-mr1-dev automerge: 8f84f62 
* commit 'ec74a7e725dbf04b38cf959e6749a18bee5344b4':
  Volume: Move "Muted by" string from sysui to frameworks.
 2014-11-14 23:01:01 +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
Jeff Sharkey
3269eb67a7 am 643e8ebc: am 84998e28: Merge "Reduce spammy PackageManager critical logs." into lmp-mr1-dev automerge: adb5def 
* commit '643e8ebca31762279597e8bb83b8dd259195c6d4':
  Reduce spammy PackageManager critical logs.
 2014-11-14 22:05:16 +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
Jeff Sharkey
a710c7444b am 9fb00cb4: am 17fe99ac: Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-dev automerge: bec816a 
* commit '9fb00cb428f3d4b0241490146f4d5a7b75fc552e':
  Fix NPE in DropBoxManagerService.dump()
 2014-11-14 22:00:54 +00:00
Raph Levien
0a39f8ffe0 am 7010d0b6: am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev automerge: 58fa003 
* commit '7010d0b6c398cb03b4be43a547921c3e9a95eeb0':
  Check bounds on CharSequence drawText methods
 2014-11-14 22:00:49 +00:00
Raph Levien
228eab2480 am c047ca45: am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev automerge: fbe0e8f 
* commit 'c047ca454012d49820e9bf14f4501156e4479881':
  Update hint text color even when text present
 2014-11-14 21:56:01 +00:00
Raph Levien
487b26f411 am 2d208505: am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev automerge: be1ad50 
* commit '2d2085052550ad0fa1b032d6cc3123b5524c5fe8':
  Fudge clipRect in TextView for extra cursor width
 2014-11-14 21:55:56 +00:00
Jeff Sharkey
2d55c4e2e8 am b536c7a6: am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev automerge: 47d2c97 
* commit 'b536c7a69340b85ef70197bbc4e443205110e2a5':
  Block loading WebView in privileged processes.
 2014-11-14 21:55:52 +00: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
Nick Kralevich
bfd5760da2 Merge "Fix build" 2014-11-14 21:52:18 +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
smain@google.com
ed5f8167de am 90610df2: am 03dd6845: am 04b393a8: am d35b8587: am 5e5af93b: remove preview system image links bug: 18376658 automerge: 55c741a 
* commit '90610df22758cfe256298a2af0b8bbc70963d7be':
  remove preview system image links bug: 18376658
 2014-11-14 21:50:41 +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
Yin-Chia Yeh
3733997225 am 19e1512d: am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev automerge: 46810bf 
* commit '19e1512dcad93a7c0217b5401208e6717962cc84':
  Camera: doc update for independent 3A
 2014-11-14 21:50:29 +00:00
Eric Laurent
4a109798bf am 8c8b9195: am 99253d00: Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev automerge: 5ff6057 
* commit '8c8b9195643d33faff186dea535b18af0ee93e09':
  AudioRecorder read buffer overflow
 2014-11-14 21:50:24 +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
Winson Chung
559ee35eb0 am c9906607: am 189457c9: Merge "Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946)" into lmp-mr1-dev automerge: 741a5b5 
* commit 'c9906607710a11883c69ae959922c5d58a6fee6f':
  Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946)
 2014-11-14 21:46:02 +00:00
Fyodor Kupolov
0477f71631 am 70b2de7c: am 6dd9f86f: Merge "Added synchronization to handlePackagesChanged method" into lmp-mr1-dev automerge: a07bdda 
* commit '70b2de7c25a083a44042ddd0cb8b2a24dde53e6e':
  Added synchronization to handlePackagesChanged method
 2014-11-14 21:45:57 +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
Nick Kralevich
660538f82a Fix build 
frameworks/base/core/jni/android_text_StaticLayout.cpp:358:43: error: overflow in implicit constant conversion [-Werror=overflow]
                               firstTabIndex = SIZE_MAX;
                                           ^
  frameworks/base/core/jni/android_text_StaticLayout.cpp:367:43: error: overflow in implicit constant conversion [-Werror=overflow]
                               firstTabIndex = SIZE_MAX;
                                           ^
  frameworks/base/core/jni/android_text_StaticLayout.cpp:391:39: error: overflow in implicit constant conversion [-Werror=overflow]
                           firstTabIndex = SIZE_MAX;
                                       ^
  cc1plus: all warnings being treated as errors
  make: *** [out/target/product/generic_arm64/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_text_StaticLayout.o] Error 1

Change-Id: I2364f697588c8657ba5f2d15cf1d60a174655613
 2014-11-14 13:43:31 -08: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
Ye Wen
7fc726193f am fc40ecd0: am 8b69c28b: Merge "Delay connecting to MmsService until APIs are called for imms" into lmp-mr1-dev automerge: 58635a5 
* commit 'fc40ecd0e6cdbf9bf48174a91c7c52c62916d97c':
  Delay connecting to MmsService until APIs are called for imms
 2014-11-14 21:41:30 +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