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

173713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
bfd5760da2 Merge "Fix build" 2014-11-14 21:52:18 +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
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
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
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
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
Nick Kralevich
cf670bc714 fix build 
frameworks/base/core/jni/android_text_StaticLayout.cpp: In member function 'int android::OptimizingLineBreaker::desperateBreak(int, int, float, float*, float*, bool*) const':
  frameworks/base/core/jni/android_text_StaticLayout.cpp:263:19: error: variable 'breakWidth' set but not used [-Werror=unused-but-set-variable]
               float breakWidth, breakPrintedWidth;
                   ^
  frameworks/base/core/jni/android_text_StaticLayout.cpp:263:31: error: variable 'breakPrintedWidth' set but not used [-Werror=unused-but-set-variable]
               float breakWidth, breakPrintedWidth;
                               ^
  frameworks/base/core/jni/android_text_StaticLayout.cpp: In function 'jint android::nComputeLineBreaks(JNIEnv*, jclass, jstring, jcharArray, jfloatArray, jint, jfloat, jint, jfloat, jintArray, jint, jboolean, jobject, jintArray, jfloatArray, jbooleanArray, jint)':
  frameworks/base/core/jni/android_text_StaticLayout.cpp:539:15: error: unused variable 'ret' [-Werror=unused-variable]
       jintArray ret;
               ^
  cc1plus: all warnings being treated as errors
  make: *** [out/target/product/hammerhead/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_text_StaticLayout.o] Error 1
  make: *** Waiting for unfinished jobs....

Change-Id: Id2b4c35bd1bc6747cc3d5cf94e3857d9118f5c21
 2014-11-14 12:41:22 -08:00
Miao Wang
27faad5bd0 am 345efc1e: am 34c495d2: Merge "Add Float32 suppor for IntrinsicResize. base part." 
* commit '345efc1e5c36863ee41856caa6ac058c975f8d9e':
  Add Float32 suppor for IntrinsicResize. base part.
 2014-11-14 19:32:04 +00:00
Craig Mautner
a8a8822aa7 am 68883159: am d21db6b6: am 135ae6dc: am 33d92c56: Use package name as custom resolver process name 
* commit '688831597953d68b2da3304b61686d9ea6410c00':
  Use package name as custom resolver process name
 2014-11-14 19:30:51 +00:00
Jason Monk
024c023c3f am b44a0df7: am 59ea2612: am 53e52e52: Merge "SysUI: Add basic test coverage for signal levels" into lmp-mr1-dev 
* commit 'b44a0df7a4ca86b976ddf01b0cbbfce6662fd6bd':
  SysUI: Add basic test coverage for signal levels
 2014-11-14 19:20:02 +00:00
Esteban Talavera
cdf1bd3da4 am fb70be1d: am 95162ad2: am 22dc3b7b: New AccountManager method to copy accounts between users. 
* commit 'fb70be1d1fbe659578dd0dd3c32e01da12ac5b08':
  New AccountManager method to copy accounts between users.
 2014-11-14 19:19:52 +00:00
Sander Alewijnse
25e9dbc4cf am 75f79bc0: am 7bec28c5: am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev 
* commit '75f79bc08b5d8c2cfe999f1dfd0d1d880c58ff93':
  Add extra to enable device admins to skip removal of system apps.
 2014-11-14 19:19:36 +00:00
Mark Renouf
5cf8a655bb am 99873867: am 7b6cadd4: am 437d02d3: am cd22c3d6: Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev 
* commit '99873867293b226d3a5670e6143f2383306f55e9':
  Sets windowOverscan for all Wear DeviceDefault themes.
 2014-11-14 19:18:51 +00:00
Alan Viverette
2fec0de51a am b757edc0: am c51e7ed0: am 42b25914: Merge "Ignore accessibility overlays during visible window computation" into lmp-mr1-dev 
* commit 'b757edc0362aae3351e81c480de766b732ffddf8':
  Ignore accessibility overlays during visible window computation
 2014-11-14 19:18:44 +00:00
Alan Viverette
a208f546d5 am 5961f6b7: am a9566f90: am 0c242376: Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev 
* commit '5961f6b767a3e549654c6bfdae2960144b4ca428':
  Set current degrees when updating RotateDrawable from typed array
 2014-11-14 19:18:39 +00:00
Alan Viverette
b7fbcefcec am db3aa6be: am 04bea090: am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev 
* commit 'db3aa6be933b732c57e7e124f40388b0695a3638':
  Account for window bounds in accessibility view click point computation
 2014-11-14 19:18:32 +00:00
Sarah Maddox
c55976f08c am 4a3dc665: am baec01af: am 2f8d4ea2: am f21e7d31: am aa3a93ed: am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs 
* commit '4a3dc665f721054c5a7a857a65301f534a6843e9':
  docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
 2014-11-14 19:18:09 +00:00
Andreas Gampe
6d6f049008 am e64565e0: Merge "Frameworks/base: Mask pdfium warning" into lmp-mr1-dev-plus-aosp 
* commit 'e64565e0a503397f0d59fed0e6aaef23807782b4':
  Frameworks/base: Mask pdfium warning
 2014-11-14 19:17:54 +00:00
Chris Craik
a76634b855 am bbac83fc: am c3784c4d: am 6b3bf0ce: Merge "Add offset method to Outline" into lmp-mr1-dev 
* commit 'bbac83fc7987b67e6116b4422aee47580aae128a':
  Add offset method to Outline
 2014-11-14 19:17:14 +00:00
Alan Viverette
3cad91aa5c am 8f5de8c6: am 96dacf36: am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev 
* commit '8f5de8c6c0d5da3c81670b72d5b412acea502d22':
  Don't dismiss AutoCompleteTextView on focus change while temp detached
 2014-11-14 19:17:09 +00:00
Alan Viverette
6ab29c3bba am 57f77e44: am d200288a: am 3fbb55c9: Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev 
* commit '57f77e44c18c9ac0b074b377eb9e74a94ef3ab2f':
  Make indeterminate progress alpha consistent with determinate
 2014-11-14 19:17:04 +00:00
ztenghui
2f96e233de am bac3f5a6: am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev 
* commit 'bac3f5a6f055876d8892ff27fb8db7355a188a68':
  Fix the starting pen's position when a path close.
 2014-11-14 19:17:00 +00:00
Nick Kralevich
076f0d5d0b am 188b6099: am e66c031d: am c9754740: Merge "fix crash on invalid base64 key" into lmp-mr1-dev 
* commit '188b609946c629e61c606b72dd423f9171953a0e':
  fix crash on invalid base64 key
 2014-11-14 19:16:55 +00:00
kmccormick
c45b0d5e0f am 5b5c83d7: am 99453e57: am 12780933: am 90bdbe8c: am 30aee7fc: am feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs 
* commit '5b5c83d797de287c25e499dac6c801bde4a4bb0b':
  Doc update: new reg error code + snippet
 2014-11-14 19:16:50 +00:00
Jeff Sharkey
afc506c54b am 670cf5c6: am 22c3f906: am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 
* commit '670cf5c663f4f17faafa9d4f7cf7209f68a02468':
  Move ringtone redirection to MediaPlayer.
 2014-11-14 19:16:38 +00:00
Abhijith Shastry
e3435feed4 am 0f064207: am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev 
* commit '0f0642075e42f415d7f5244c5d94fe726756afa0':
  new sms/mms carrier app API
 2014-11-14 19:16:33 +00:00
Andreas Gampe
18fddfe020 am c25e0dce: am 5b50cd13: Merge "Frameworks/base: Fix build" 
* commit 'c25e0dcea982468225c4150dcb699db5185a1eee':
  Frameworks/base: Fix build
 2014-11-14 19:15:59 +00:00
Andreas Gampe
2e4ad0a641 am d99c25ef: am 37079e29: Merge "Frameworks/base: Wall Werror in packages" 
* commit 'd99c25eff3ad421b900caf7af82f970b23a81733':
  Frameworks/base: Wall Werror in packages
 2014-11-14 19:15:52 +00:00
Andreas Gampe
ed5d5fb434 am 035a7b02: am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni" 
* commit '035a7b0235835e856f39623fc571668e2d6048da':
  Frameworks/base: Wall Werror in core/jni
 2014-11-14 19:15:42 +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
smain@google.com
03dd684564 am 04b393a8: am d35b8587: am 5e5af93b: remove preview system image links bug: 18376658 
* commit '04b393a812bbbe9975df6e7d20514c797398d571':
  remove preview system image links bug: 18376658
 2014-11-14 19:06:43 +00:00
Yin-Chia Yeh
46810bf200 am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev 
* commit 'cb6eae0e2eda2a9383ba2682b739b3616a9eaefc':
  Camera: doc update for independent 3A
 2014-11-14 19:06:37 +00:00
Eric Laurent
5ff6057bd3 am 99253d00: Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev 
* commit '99253d001f835a8d23c337b8dfd6a6cbc6d7a740':
  AudioRecorder read buffer overflow
 2014-11-14 19:06:27 +00:00
Winson Chung
741a5b5a02 am 189457c9: Merge "Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946)" into lmp-mr1-dev 
* commit '189457c931bbc5fe5c9bbf61050dca7db3d45194':
  Fixing crash in querying the task stack from a fresh load plan. (Bug 18371946)
 2014-11-14 19:06:19 +00:00
Fyodor Kupolov
a07bdda0d4 am 6dd9f86f: Merge "Added synchronization to handlePackagesChanged method" into lmp-mr1-dev 
* commit '6dd9f86f10deda42ea5374f83d2a189c3a72d68f':
  Added synchronization to handlePackagesChanged method
 2014-11-14 19:06:14 +00:00
Ye Wen
58635a571d am 8b69c28b: Merge "Delay connecting to MmsService until APIs are called for imms" into lmp-mr1-dev 
* commit '8b69c28b7d446c35e4d644ce4935a31bac228e00':
  Delay connecting to MmsService until APIs are called for imms
 2014-11-14 19:06:07 +00:00
smain@google.com
04b393a812 am d35b8587: am 5e5af93b: remove preview system image links bug: 18376658 
* commit 'd35b858706ab7d7ec4685fa384ca3cd42d1ec316':
  remove preview system image links bug: 18376658
 2014-11-14 19:00:09 +00:00
Geoff Mendal
62d9f4086a am aba61dc1: (-s ours) am 85e5c196: (-s ours) am a81b1cad: (-s ours) am 4cc7bbc9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'aba61dc19d6f1566ba153746cabd63e689735418':
  Import translations. DO NOT MERGE
 2014-11-14 18:56:35 +00:00
Jeff Brown
cfeb06165b am 5e94e19c: am c69191c1: am cb906677: am 24c1d664: Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev 
* commit '5e94e19c1fe0a4379348b392d5f2cbc52b304bb5':
  Remove an unnecessary condition from previous change.
 2014-11-14 18:56:30 +00:00
Jeff Brown
34bf3e8b40 am 36ed887f: am 3415634c: am 72f1e3b9: am 1cbff0e3: Merge "Improve screen brightness boost behavior." into lmp-sprout-dev 
* commit '36ed887fa3f9cc7274299a7289d2cbf071f41436':
  Improve screen brightness boost behavior.
 2014-11-14 18:56:25 +00:00
Renato Mangini
43b6008558 am 70955365: am 46112fe1: am 7e582533: am ee291ca2: am 6f41522d: am c9fc837f: Add new samples to what\'s new page. 
* commit '70955365b7ac66dca0eaa47e3636ca87fa138137':
  Add new samples to what's new page.
 2014-11-14 18:56:20 +00:00
John Spurlock
72ea52cb74 am eba075e5: am 338bc5a4: Merge "Zen: Update condition text for current condition." into lmp-mr1-dev automerge: 1a68ba6 
* commit 'eba075e5db77966f942c2fb504be7543c69b1f19':
  Zen: Update condition text for current condition.
 2014-11-14 18:55:17 +00:00