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

153724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
7d26fa32cc am 8dd4914b: am c5e138f7: Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev 
* commit '8dd4914ba3ece4e408571cfcc19da4d801cecbfa':
  Fix issue #17375172...   sshhhhhh!!!
 2014-09-04 23:30:11 +00:00
Dianne Hackborn
38147c9218 am c5e138f7: Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev 
* commit 'c5e138f774ca46cf2f2fb58a040c2f91685d00cf':
  Fix issue #17375172...   sshhhhhh!!!
 2014-09-04 23:17:20 +00:00
Andreas Gampe
79de4de3a4 Merge "resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-09-04 23:17:12 +00:00
Andreas Gampe
dc84c6ca86 resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp 
Change-Id: I7ae05c4f1b072906932a9ed47bdbad881b8e0d37
 2014-09-04 16:15:52 -07:00
Tom O'Neill
f0614ae955 am 15674b91: am b1a1f355: Merge "Keep LMP from breaking KitKat API" into lmp-dev 
* commit '15674b917ef505de8bb64c765a21fbe679f79f6b':
  Keep LMP from breaking KitKat API
 2014-09-04 23:12:45 +00:00
Dianne Hackborn
edfc6af590 Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev 2014-09-04 23:08:24 +00:00
Tom O'Neill
0f8fcff91f am b1a1f355: Merge "Keep LMP from breaking KitKat API" into lmp-dev 
* commit 'b1a1f35522ac14076d79942ccb673ef2d2b4061a':
  Keep LMP from breaking KitKat API
 2014-09-04 23:04:31 +00:00
Jeff Sharkey
fd9e0e8d25 am 51c82f1b: am 04324ae4: Merge changes I10ab0b4a,Id32dcbd5 into lmp-dev 
* commit '51c82f1be958e80e2f32c13312f28663fc0d49d5':
  Catch incompatible API regressions.
  Add blame to API lint, some exemptions.
 2014-09-04 23:04:31 +00:00
Jeff Sharkey
6de676ca84 am daf82380: am 8fcdda89: Merge "Hold package cleaning until system is ready." into lmp-dev 
* commit 'daf823800795d25629372cd5068d9340a97ed841':
  Hold package cleaning until system is ready.
 2014-09-04 23:04:26 +00:00
Amith Yamasani
0b6ce453a2 am 4a94107f: am 3971e42e: Merge "Fix crash if package setting is not populated yet" into lmp-dev 
* commit '4a94107f50d77cc634bb7e931a25ce9ab6b263df':
  Fix crash if package setting is not populated yet
 2014-09-04 23:04:21 +00:00
Tom O'Neill
649db7f0a5 Merge "Keep LMP from breaking KitKat API" into lmp-dev 2014-09-04 22:56:58 +00:00
Jeff Sharkey
4c73571873 am 04324ae4: Merge changes I10ab0b4a,Id32dcbd5 into lmp-dev 
* commit '04324ae4f14b1b8bfaa79d3e90535b8080bd517b':
  Catch incompatible API regressions.
  Add blame to API lint, some exemptions.
 2014-09-04 22:54:38 +00:00
Jeff Sharkey
132670d54d am 8fcdda89: Merge "Hold package cleaning until system is ready." into lmp-dev 
* commit '8fcdda893bb0113fcf4b839ca1a3f2b075a1be6a':
  Hold package cleaning until system is ready.
 2014-09-04 22:54:33 +00:00
Amith Yamasani
0e66e97d24 am 3971e42e: Merge "Fix crash if package setting is not populated yet" into lmp-dev 
* commit '3971e42ebcbc1cd07961f338c657c1392a87f4a5':
  Fix crash if package setting is not populated yet
 2014-09-04 22:54:29 +00:00
Jeff Sharkey
8b9c97a4e2 Merge changes I10ab0b4a,Id32dcbd5 into lmp-dev 
* changes:
  Catch incompatible API regressions.
  Add blame to API lint, some exemptions.
 2014-09-04 22:49:22 +00:00
Jeff Sharkey
fd12f4c9e4 Merge "Hold package cleaning until system is ready." into lmp-dev 2014-09-04 22:49:17 +00:00
Amith Yamasani
7767df3c9c Merge "Fix crash if package setting is not populated yet" into lmp-dev 2014-09-04 22:47:51 +00:00
Jeff Sharkey
037458a5ba Catch incompatible API regressions. 
Ignore deprecation, synchronized, and throws definitions.  Look
through full inheritance hierarchy to catch refactored classes like
BaseBundle.

Change-Id: I10ab0b4a0ef64e7508f38d0c223f08711293d643
 2014-09-04 15:46:23 -07:00
Tom O'Neill
17c5e79496 Keep LMP from breaking KitKat API 
- Bug: 17390371

Change-Id: I25c1abebcc42ed24abd57bbe2834a40fb8ee834b
 2014-09-04 15:42:36 -07:00
Dianne Hackborn
2d0368a775 am 33435c99: am 10053171: Merge "Fix issue #17175312: Calendar crashed when tapping on the event notification" into lmp-dev 
* commit '33435c99a5235b07780b59b43ee5eec4810d1535':
  Fix issue #17175312: Calendar crashed when tapping on the event notification
 2014-09-04 22:02:03 +00:00
Andreas Gampe
82ad9ec3d1 am 523afd15: Merge "Frameworks/base: Add native bridge post-fork initialization" 
* commit '523afd157be99ddce8c0f643caceb9db4a9227bb':
  Frameworks/base: Add native bridge post-fork initialization
 2014-09-04 21:55:34 +00:00
Dianne Hackborn
521e4bd7c5 Fix issue #17375172... sshhhhhh!!! 
Change-Id: Idf3eafe829418bfc29e31f893ae6cff249488ffa
 2014-09-04 14:50:26 -07:00
Dianne Hackborn
7f1a43e128 am 10053171: Merge "Fix issue #17175312: Calendar crashed when tapping on the event notification" into lmp-dev 
* commit '10053171abe4d09ed0e05cdc68c575a1048593b6':
  Fix issue #17175312: Calendar crashed when tapping on the event notification
 2014-09-04 21:50:12 +00:00
Andreas Gampe
523afd157b Merge "Frameworks/base: Add native bridge post-fork initialization" 2014-09-04 21:47:13 +00:00
Tom Taylor
09d97d18f5 am f0c7663d: am d1006b0f: Merge "Add mcc/mnc to SubInfoRecord" into lmp-dev 
* commit 'f0c7663d857b5be26972f08d08779a95566b3ef7':
  Add mcc/mnc to SubInfoRecord
 2014-09-04 21:44:31 +00:00
Dianne Hackborn
c50e7e8477 Merge "Fix issue #17175312: Calendar crashed when tapping on the event notification" into lmp-dev 2014-09-04 21:40:31 +00:00
Tom Taylor
d8393319d1 am d1006b0f: Merge "Add mcc/mnc to SubInfoRecord" into lmp-dev 
* commit 'd1006b0f0372e068eac20c5c48f825a087577bae':
  Add mcc/mnc to SubInfoRecord
 2014-09-04 21:36:55 +00:00
Robert Greenwalt
70e41aac60 am db613a0f: am ca6b015f: Merge "Catch creation of NetworkRequest without NetCap" into lmp-dev 
* commit 'db613a0fa90227a742682ea7d621c0f6ec264bc0':
  Catch creation of NetworkRequest without NetCap
 2014-09-04 21:26:09 +00:00
Chris Craik
600dc4393a am 323e213d: am b25a4d5f: Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev 
* commit '323e213d0aff4e4120ce183ac4c38d63b593ecee':
  Prioritize reveal clipping over Outline clipping
 2014-09-04 21:26:02 +00:00
Tom Taylor
3f70141ed0 Merge "Add mcc/mnc to SubInfoRecord" into lmp-dev 2014-09-04 21:22:45 +00:00
David Christie
25fb15035b am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 
* commit 'd3a78eff9d1a34f4638ddfdb6b1f3519b10426b7':
  Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 21:17:20 +00:00
RoboErik
aefb63d596 am 41151329: am 9c7c737a: Merge "Ensure there\'s a valid handler when registering a sessions listener" into lmp-dev 
* commit '41151329142a8eadb8a7677b27487c9915183139':
  Ensure there's a valid handler when registering a sessions listener
 2014-09-04 21:17:16 +00:00
Eric Laurent
e3cbfc661e am c61756c5: am f225a5c2: Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev 
* commit 'c61756c594c8cfb806882f47148287f827e4102e':
  AudioManager: only use main looper for AudioPort event handler
 2014-09-04 21:17:10 +00:00
Alan Viverette
f97d540026 am 2bb0dec5: am 69dc952d: Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev 
* commit '2bb0dec5fb6e4e1d112bbbea7ce59ae0d6b9127a':
  Fix AM/PM text i18n and clean up keyboard support in time picker
 2014-09-04 21:17:05 +00:00
Alan Viverette
b053e16027 am 83a9b505: am cfad03e3: Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev 
* commit '83a9b505f452c4518f445540d1b3059d52775507':
  Fix clip rect when drawing accessibility focus rect
 2014-09-04 21:17:01 +00:00
Craig Mautner
54dee06570 am ae433669: am ac8731f9: Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev 
* commit 'ae43366952e7811c62684878f8f160c44a8454fa':
  Eliminate deadlock by deferring wipe data call
 2014-09-04 21:16:56 +00:00
Raph Levien
01fb255d78 am f7380a69: am 58e457cc: Merge "Fix Layout.isRtlCharAt" into lmp-dev 
* commit 'f7380a6978d3f5b848df277fb23fbc544e148e61':
  Fix Layout.isRtlCharAt
 2014-09-04 21:16:52 +00:00
Robert Greenwalt
bc6ce2050e am ca6b015f: Merge "Catch creation of NetworkRequest without NetCap" into lmp-dev 
* commit 'ca6b015f26c1b8f6d701677961b0b48c21ab7c36':
  Catch creation of NetworkRequest without NetCap
 2014-09-04 21:16:51 +00:00
Alan Viverette
54c3b78a01 am 009ac82c: am 3d6f0211: Merge "Clear ripple animations on cancel/end" into lmp-dev 
* commit '009ac82ce8e5f062ecaa51f29fb8ba05d17c6763':
  Clear ripple animations on cancel/end
 2014-09-04 21:16:47 +00:00
Chris Craik
45769f139d am b25a4d5f: Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev 
* commit 'b25a4d5fbbbbcaefd0c494c410542680db9c7d11':
  Prioritize reveal clipping over Outline clipping
 2014-09-04 21:16:46 +00:00
David Christie
1e76e568dc am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 
* commit '36b0eac472fdbc45db378646170b891581b53b36':
  Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 21:08:19 +00:00
RoboErik
27fcccce63 am 9c7c737a: Merge "Ensure there\'s a valid handler when registering a sessions listener" into lmp-dev 
* commit '9c7c737a603807e727721d00b70a227f60c674e1':
  Ensure there's a valid handler when registering a sessions listener
 2014-09-04 21:08:14 +00:00
Robert Greenwalt
d35d826fb5 Merge "Catch creation of NetworkRequest without NetCap" into lmp-dev 2014-09-04 21:08:11 +00:00
Eric Laurent
a4722007c2 am f225a5c2: Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev 
* commit 'f225a5c2410eb7a9417f02e65afbe0f92a338a25':
  AudioManager: only use main looper for AudioPort event handler
 2014-09-04 21:08:08 +00:00
Alan Viverette
72c36bd77b am 69dc952d: Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev 
* commit '69dc952dba40c2c5ab3f0e596391e330ff9f71c8':
  Fix AM/PM text i18n and clean up keyboard support in time picker
 2014-09-04 21:08:04 +00:00
Alan Viverette
4765bd4605 am cfad03e3: Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev 
* commit 'cfad03e3088ea3f673859c1ada257f299b4ebe68':
  Fix clip rect when drawing accessibility focus rect
 2014-09-04 21:07:59 +00:00
Craig Mautner
547faf79e1 am ac8731f9: Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev 
* commit 'ac8731f94bb416be0cc54f226bda1929b0cba2c0':
  Eliminate deadlock by deferring wipe data call
 2014-09-04 21:07:54 +00:00
Raph Levien
91401c38d8 am 58e457cc: Merge "Fix Layout.isRtlCharAt" into lmp-dev 
* commit '58e457ccaf9d9b864d4033be18ddf0e71a218952':
  Fix Layout.isRtlCharAt
 2014-09-04 21:07:49 +00:00
Alan Viverette
ad4a58fa57 am 3d6f0211: Merge "Clear ripple animations on cancel/end" into lmp-dev 
* commit '3d6f02118c08b45e1b9a4b9a28ca494db4bf5e3e':
  Clear ripple animations on cancel/end
 2014-09-04 21:07:42 +00:00
Chris Craik
2d3f9033f8 Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev 2014-09-04 21:06:10 +00:00