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

160921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yao Chen
08312e4094 am 31f80f0f: Assign bindService() result to a boolean directly. One less if-else 
* commit '31f80f0fddd2b59d3722dd73c942eaecf11e12c3':
  Assign bindService() result to a boolean directly. One less if-else
 2014-09-27 05:25:52 +00:00
Dirk Dougherty
c2f4985e84 am cdc49451: am 5913f406: am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs 
* commit 'cdc494512edb13c0405e1f4410439112e39102ae':
  Doc change: Add new index page for games stories.
 2014-09-27 05:24:58 +00:00
Dirk Dougherty
cdc494512e am 5913f406: am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs 
* commit '5913f40618494a361b4cc0c79aebdd2f0a9170da':
  Doc change: Add new index page for games stories.
 2014-09-27 05:20:38 +00:00
Dirk Dougherty
5913f40618 am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs 
* commit '6373718b883dd945c17987ac64925c0fdc30674d':
  Doc change: Add new index page for games stories.
 2014-09-27 05:14:05 +00:00
Etan Cohen
dcc0736c43 Added mechanism to merge voice & baseline ServiceState objects. 
Needed in the context of separate phones handling baseline connectivity
and voice connectivity (e.g. IMS).

Bug: 17627405
Change-Id: Ifb5a6ea11f6350090b989408e9eed80958d8558b
 2014-09-27 04:55:28 +00:00
Marco Nelissen
e3fafc1d8a am 7e51102c: Merge "Validate MTP path" into lmp-dev 
* commit '7e51102c02342ec2fe867f70d0cf3480b8f12809':
  Validate MTP path
 2014-09-27 03:18:53 +00:00
Dirk Dougherty
6373718b88 Merge "Doc change: Add new index page for games stories." into klp-modular-docs 2014-09-27 03:16:53 +00:00
Andres Morales
66b63cb825 Merge "Mark PDB identifier as SystemApi" into lmp-dev 2014-09-27 02:26:00 +00:00
Ruben Brunk
7b28c66a6c Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev 2014-09-27 02:16:30 +00:00
Sailesh Nepal
77780a4e37 Don't print error log if phone account icon is missing 
Bug: 17678017
Change-Id: I212a815af26af1d344092d874c057e9481642263
 2014-09-26 18:14:54 -07:00
Yao Chen
c8a3e0dc9d Assign bindService() result to a boolean directly. One less if-else 
Bug: 17637058
Change-Id: If2f4db2ebf95f1912a752794a1ab482cf30ab014
 2014-09-27 01:08:39 +00:00
Marco Nelissen
f8c4f9efcb Merge "Validate MTP path" into lmp-dev 2014-09-27 01:03:50 +00:00
Ruben Brunk
31798f3318 camera2: Fix native ImageReader test segfaults. 
Bug: 17675571

- Check for JPEG footer in correct location from ImageReader
  when using the RGBA override.
- Add additional error checks in produceFrame method.
- Avoid allocating extra space for jpeg buffers due to
  incorrect width calculations.

Change-Id: I926f37e8b3e5c4bad24c16dcee48d52adb1706dd
 2014-09-26 18:00:21 -07:00
Dirk Dougherty
14b606afaf am c0b2e863: am ed203ffe: am 69ef4342: am 5a0ce7a1: am dea43111: am 8d03b0b9: am afbe165a: Doc change: Add IAB v2 deprecation notice. 
* commit 'c0b2e863e6c487030d56a37f8231058445b811fe':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-27 00:51:54 +00:00
Dirk Dougherty
2fa8f509e8 am ed203ffe: am 69ef4342: am 5a0ce7a1: am dea43111: am 8d03b0b9: am afbe165a: Doc change: Add IAB v2 deprecation notice. 
* commit 'ed203ffe8607e3516d0fe821261a12a2abfbd284':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-27 00:46:43 +00:00
Dirk Dougherty
eb81afbe29 Doc change: Add new index page for games stories. 
Change-Id: Icd9de0715c8a77333fd73a46f31c3ad81d0b951b
 2014-09-26 17:43:14 -07:00
Dirk Dougherty
6e2bba7d34 am 69ef4342: am 5a0ce7a1: am dea43111: am 8d03b0b9: am afbe165a: Doc change: Add IAB v2 deprecation notice. 
* commit '69ef434238c23961214ed46911d6eb74d617cb95':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-27 00:41:51 +00:00
Dirk Dougherty
88a8d7f8f0 am 5a0ce7a1: am dea43111: am 8d03b0b9: am afbe165a: Doc change: Add IAB v2 deprecation notice. 
* commit '5a0ce7a15825a94587ce28ad353a462e7b7bb6b1':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-27 00:37:04 +00:00
Dirk Dougherty
9e1dccc181 am dea43111: am 8d03b0b9: am afbe165a: Doc change: Add IAB v2 deprecation notice. 
* commit 'dea43111e1234153794ed54b4883e725043c2ba7':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-27 00:33:06 +00:00
Dirk Dougherty
dea43111e1 am 8d03b0b9: am afbe165a: Doc change: Add IAB v2 deprecation notice. 
* commit '8d03b0b987172e70d0bd6522fadc7505a3ff2b1d':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-27 00:27:26 +00:00
Dirk Dougherty
8d03b0b987 am afbe165a: Doc change: Add IAB v2 deprecation notice. 
* commit 'afbe165aecb00b74f8228314cc60b28af089e8e3':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-27 00:22:41 +00:00
Andres Morales
33df937f6f Mark PDB identifier as SystemApi 
Had already marked the API itself as system api, just not
the Context.BLAH id. Also update the javadoc as it doesn't
return an FD anymore.

Change-Id: Ic8a5b8c75b0ba0bdf4ad26cf33d5f87eea568376
 2014-09-26 17:08:59 -07:00
Eino-Ville Talvala
7741a3b77b am fdc04cc2: am 03b3a63f: am 92a92a93: am 678e4328: Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev 
* commit 'fdc04cc29acdae5d3ab3cf3f45a9869fbd99cd9e':
  Camera2: Fix parallel session and device close() exception
 2014-09-27 00:02:50 +00:00
Amit Mahajan
79101ae7aa am 22ab14bc: am c6819ed0: am 234e41f7: am 32241895: Merge "Handling service number convert while roaming." into lmp-dev 
* commit '22ab14bc172d01ac2257bf3dc1e677b31d7e6f6d':
  Handling service number convert while roaming.
 2014-09-27 00:02:46 +00:00
Eino-Ville Talvala
3b0a77c0d8 am 03b3a63f: am 92a92a93: am 678e4328: Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev 
* commit '03b3a63f11260f77ffb647984c1a2160e1de5bd5':
  Camera2: Fix parallel session and device close() exception
 2014-09-26 23:56:57 +00:00
Amit Mahajan
fe5202b276 am c6819ed0: am 234e41f7: am 32241895: Merge "Handling service number convert while roaming." into lmp-dev 
* commit 'c6819ed0f9241fcb47d72168ad1f9806e2d81029':
  Handling service number convert while roaming.
 2014-09-26 23:56:52 +00:00
Eino-Ville Talvala
332b01e067 am 92a92a93: am 678e4328: Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev 
* commit '92a92a93c09d0e1f405d292560f32b2f3a4dc62d':
  Camera2: Fix parallel session and device close() exception
 2014-09-26 23:53:12 +00:00
Amit Mahajan
49b14f083c am 234e41f7: am 32241895: Merge "Handling service number convert while roaming." into lmp-dev 
* commit '234e41f7287f431a36bde9240f3c4bc198bc170c':
  Handling service number convert while roaming.
 2014-09-26 23:53:06 +00:00
Eino-Ville Talvala
8883ada99b am 678e4328: Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev 
* commit '678e432809fcde0d189f1130887bb201967eb342':
  Camera2: Fix parallel session and device close() exception
 2014-09-26 23:45:15 +00:00
Amit Mahajan
5c93285481 am 32241895: Merge "Handling service number convert while roaming." into lmp-dev 
* commit '32241895dfbef8a84f60c7294b334a5ae8e28fee':
  Handling service number convert while roaming.
 2014-09-26 23:45:11 +00:00
Eino-Ville Talvala
ccc483696b Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev 2014-09-26 23:42:30 +00:00
Alan Viverette
a389144009 am 143631f0: am d3957f25: am a6958574: am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 
* commit '143631f0d4a5f69b73ae9019e6a1ccbc895dc12e':
  Add callback to track and thumb drawables, propagate state in ASLD
 2014-09-26 23:42:07 +00:00
Dianne Hackborn
09f144176e am 8776bd54: am cad60dc8: am 72bc7651: am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '8776bd549ed4db7c5e2e5f487d043e8d1b53ff12':
  More debugging for issue #17656716: Unhandled exception in Window Manager
 2014-09-26 23:42:02 +00:00
Amit Mahajan
ce1416a64d Merge "Handling service number convert while roaming." into lmp-dev 2014-09-26 23:32:51 +00:00
Alan Viverette
0fa0dce5c2 am d3957f25: am a6958574: am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 
* commit 'd3957f25f24555f2ff2ed57fa2678b1efaea46f0':
  Add callback to track and thumb drawables, propagate state in ASLD
 2014-09-26 23:30:19 +00:00
Dianne Hackborn
17e07afbcb am cad60dc8: am 72bc7651: am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'cad60dc87d670734e4142d469ae8e3254a99e189':
  More debugging for issue #17656716: Unhandled exception in Window Manager
 2014-09-26 23:26:17 +00:00
Alan Viverette
dfb0b303de am a6958574: am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 
* commit 'a69585749e38e5300162317e4f046dc66cdf1966':
  Add callback to track and thumb drawables, propagate state in ASLD
 2014-09-26 23:24:30 +00:00
Dianne Hackborn
08cb4ec7a7 am 72bc7651: am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '72bc7651fb7b7fff7e3a0a4d0d61cada28278b2d':
  More debugging for issue #17656716: Unhandled exception in Window Manager
 2014-09-26 23:20:26 +00:00
Alan Viverette
72f1d94fed am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 
* commit '637569566d2234b06e08d94acf4db1b0d3be6501':
  Add callback to track and thumb drawables, propagate state in ASLD
 2014-09-26 23:19:12 +00:00
Svetoslav
bd8db7b102 am daeee005: am 16f3a714: am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 
* commit 'daeee0053554a7ce81e1586e52521d4ca13bbc94':
  Accessibility node provider getting invalid virtual view id.
 2014-09-26 23:18:06 +00:00
Dianne Hackborn
e4f529c7ba am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'cbb94a27c1f0fa8c2b459ffe3206eb96006f92dc':
  More debugging for issue #17656716: Unhandled exception in Window Manager
 2014-09-26 23:15:04 +00:00
Alan Viverette
ab9f1bab6b Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 2014-09-26 23:13:55 +00:00
RoboErik
66aec18ad3 am e825d695: am 3a85b618: am 065b605c: am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev 
* commit 'e825d6958821a4d63c2e7db39c1c02b4300dd1c8':
  Don't forward media keys to the app if the phone session is active
 2014-09-26 23:13:54 +00:00
Elliott Hughes
5d8bcd285d am 737b8cd2: am 7d614689: am 416de7fd: am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '737b8cd29ccc9799f8a309ca33c0ba4f4c0016d4':
  Set the system locale correctly even on an encrypted device.
 2014-09-26 23:13:49 +00:00
Svetoslav
7755737523 am 16f3a714: am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 
* commit '16f3a7143e835464393bc21906ebec5e78ffd4d0':
  Accessibility node provider getting invalid virtual view id.
 2014-09-26 23:12:41 +00:00
Alan Viverette
b067405bf4 Add callback to track and thumb drawables, propagate state in ASLD 
BUG: 17665424
Change-Id: I22da4530f3e2869d856102e804f020461a46fe49
 2014-09-26 16:12:16 -07:00
Dianne Hackborn
820eab3e75 Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-09-26 23:11:40 +00:00
RoboErik
7412965a54 am 3a85b618: am 065b605c: am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev 
* commit '3a85b6187dc6d0000f2d0efe0077b18ea83d696e':
  Don't forward media keys to the app if the phone session is active
 2014-09-26 23:08:24 +00:00
Elliott Hughes
4c5965b0eb am 7d614689: am 416de7fd: am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '7d614689b2b7228c6d5fec97928c9068e412f733':
  Set the system locale correctly even on an encrypted device.
 2014-09-26 23:08:20 +00:00
Svetoslav
78efd1be8c am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 
* commit '5cdfd3ac79d5e2bf23652a6fb52f95f1267ee9fe':
  Accessibility node provider getting invalid virtual view id.
 2014-09-26 23:08:13 +00:00