Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
166,275 Commits 3 Branches 0 Tags
53ae7745b09638e0d26728ea643f8804be317cd2
Commit Graph

42712 Commits

Author SHA1 Message Date
Benjamin Franz
53ae7745b0 am adabf536: am 00fcb749: am 31409c0c: Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev 
* commit 'adabf536fbb971b2eb50a37f563e3027bda04061':
  Introduce new API to get an unbadged icon and unbadge permissions.
 2014-10-06 16:56:48 +00:00
Benjamin Franz
adabf536fb am 00fcb749: am 31409c0c: Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev 
* commit '00fcb749cbd26c83d1a29a974bd92967b41c5882':
  Introduce new API to get an unbadged icon and unbadge permissions.
 2014-10-06 16:52:27 +00:00
Benjamin Franz
31409c0ccd Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev 2014-10-06 16:26:27 +00:00
vandwalle
3041a9e07d am 542cc240: am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev 
* commit '542cc240b5bd68a728067f65cd8bc4d8f6473b83':
  add millisecond timestamp to locallog
 2014-10-04 16:06:17 +00:00
John Reck
b9ba53d088 am 6e4140c6: am c4694796: am 6a2296d8: am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev 
* commit '6e4140c6e2d6f14ba225b2ae5926cc0f2794056a':
  Cleanup DeferredLayerUpdater
 2014-10-04 16:05:59 +00:00
vandwalle
542cc240b5 am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev 
* commit '88b927e258214a31342326d46f527528e5979f85':
  add millisecond timestamp to locallog
 2014-10-04 15:45:35 +00:00
John Reck
6e4140c6e2 am c4694796: am 6a2296d8: am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev 
* commit 'c4694796a952014d07e6d083749d2f8b7d06afee':
  Cleanup DeferredLayerUpdater
 2014-10-04 15:45:20 +00:00
vandwalle
c67e5ae2da am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev 
* commit '4f5fd78019bda5582f652393fdc3c83f45100bf1':
  add millisecond timestamp to locallog
 2014-10-03 23:57:40 +00:00
John Reck
6a2296d856 am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev 
* commit '9da6e7435945e34d05e0c8c5c9a324218480c6ff':
  Cleanup DeferredLayerUpdater
 2014-10-03 23:57:30 +00:00
vandwalle
4f5fd78019 am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev 
* commit '68104b0529da95644c6cb65ab7ebb0c0bf7dff57':
  add millisecond timestamp to locallog
 2014-10-03 23:53:17 +00:00
John Reck
9da6e74359 am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev 
* commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb':
  Cleanup DeferredLayerUpdater
 2014-10-03 23:53:05 +00:00
vandwalle
68104b0529 Merge "add millisecond timestamp to locallog" into lmp-dev 2014-10-03 23:31:51 +00:00
vandwalle
c520aa89a3 add millisecond timestamp to locallog 
Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
 2014-10-03 15:35:25 -07:00
John Reck
d988a45d60 Merge "Cleanup DeferredLayerUpdater" into lmp-dev 2014-10-03 22:22:52 +00:00
John Reck
749906b468 Cleanup DeferredLayerUpdater 
Bug: 17765082

DeferredLayerUpdater had fallen behind RT updates. Re-snap to
latest expectations, ensuring to call requireGlContext() prior
to detachSurfaceTexture to avoid leaking SurfaceTextures

Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
 2014-10-03 15:02:19 -07:00
Dianne Hackborn
c7d1467a8b am cba999c1: am e2776f02: am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit 'cba999c164d206c1fb2b7f9f2bf78e8ed616c67d':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 21:59:09 +00:00
Dianne Hackborn
cba999c164 am e2776f02: am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit 'e2776f02bf4fd58af88a27261226e9ce124aa6b8':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 21:52:23 +00:00
Dianne Hackborn
6b1cf642fc am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit '5ebb0e6a1ea16630f7b7be2380eaeb9f16876ab5':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 21:32:30 +00:00
Dianne Hackborn
5ebb0e6a1e am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit 'd867b7c7a2c8c151c01b57597b6612ca5355a51a':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 19:21:06 +00:00
Dianne Hackborn
d867b7c7a2 Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
...'java.lang.String java.lang.String.substring(int)' on a null object reference

Change-Id: I4a78653174da398a4edd23b2bc099598548b79c2
 2014-10-03 11:43:10 -07:00
Robert Greenwalt
5b64ec7439 am 271d79ec: am a9ba8347: am eb35fa56: am 3515ab80: am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev 
* commit '271d79ecf1f0a9ac2c9945735c55a9a33f5fcda6':
  Send callbacks for Net property changes
 2014-10-03 15:59:40 +00:00
Robert Greenwalt
271d79ecf1 am a9ba8347: am eb35fa56: am 3515ab80: am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev 
* commit 'a9ba8347afb7252b28f51b74b6e1f1ae9befdd75':
  Send callbacks for Net property changes
 2014-10-03 15:55:37 +00:00
Robert Greenwalt
eb35fa56a4 am 3515ab80: am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev 
* commit '3515ab8092719ea9f61c8c2859bf586aed0955e3':
  Send callbacks for Net property changes
 2014-10-03 15:46:06 +00:00
Robert Greenwalt
3515ab8092 am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev 
* commit '24861eabe641d5a147f127c8e7f98fab949224ab':
  Send callbacks for Net property changes
 2014-10-03 15:41:04 +00:00
Robert Greenwalt
24861eabe6 Merge "Send callbacks for Net property changes" into lmp-dev 2014-10-03 15:36:39 +00:00
Benjamin Franz
ec2d48b96d Introduce new API to get an unbadged icon and unbadge permissions. 
Bug: 17125560
Change-Id: I61b884186c96cc54dcaf1d3c7ee8f47610fd1d21
 2014-10-03 09:41:08 +01:00
Robert Greenwalt
a848c1cc0a Send callbacks for Net property changes 
LinkProperties and NetworkCapabilities changes were not calling app callbacks.

bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f
 2014-10-02 21:05:44 -07:00
Dianne Hackborn
09f25547d9 am 4bcfcc69: am b49a19b9: am 8aa21f20: am 12dd9943: am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 
* commit '4bcfcc69416831b199fb866f56725c88cdcee03c':
  SDK only: Update docs to reflect current implementation.
 2014-10-02 23:46:25 +00:00
Dianne Hackborn
4bcfcc6941 am b49a19b9: am 8aa21f20: am 12dd9943: am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 
* commit 'b49a19b9bd2fed00b8fbf3f5a4f9fb7c34e969a3':
  SDK only: Update docs to reflect current implementation.
 2014-10-02 23:37:54 +00:00
Dianne Hackborn
8aa21f20d8 am 12dd9943: am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 
* commit '12dd9943ec01a54453f50a24da2a8e329f2d3790':
  SDK only: Update docs to reflect current implementation.
 2014-10-02 22:59:51 +00:00
Dianne Hackborn
12dd9943ec am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 
* commit '7a73f2c5aab16e2d4c21fcce9aa8173e87ecfb4f':
  SDK only: Update docs to reflect current implementation.
 2014-10-02 22:54:53 +00:00
Dianne Hackborn
7a73f2c5aa Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 2014-10-02 22:49:43 +00:00
Jeff Brown
7e742c5748 am 95afeee9: am be9d012f: am 6f2d610f: am b82bf9df: am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev 
* commit '95afeee9b12b43c02fbb5469c767ea08d7eeff87':
  Fix race in RecognizerService teardown.
 2014-10-02 22:35:26 +00:00
Jeff Brown
95afeee9b1 am be9d012f: am 6f2d610f: am b82bf9df: am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev 
* commit 'be9d012fd984011049719dcb4af08c63dba64fcc':
  Fix race in RecognizerService teardown.
 2014-10-02 22:29:04 +00:00
Jeff Brown
6f2d610f4d am b82bf9df: am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev 
* commit 'b82bf9df111031e0f3afa4df29fbc22460e6cc8b':
  Fix race in RecognizerService teardown.
 2014-10-02 22:12:54 +00:00
Christopher Tate
5d12de3e4a am 6f6dd6ed: am 1d647ab5: am 61eae160: am ac3aed96: am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit '6f6dd6edacc5b86604d3276ee710996bcb980a3a':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 22:12:39 +00:00
Jeff Brown
b82bf9df11 am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev 
* commit 'ae309489c2b22c6cfcc6701b5dea13c652239ecd':
  Fix race in RecognizerService teardown.
 2014-10-02 22:09:08 +00:00
Jeff Brown
ae309489c2 Merge "Fix race in RecognizerService teardown." into lmp-dev 2014-10-02 22:04:09 +00:00
Christopher Tate
6f6dd6edac am 1d647ab5: am 61eae160: am ac3aed96: am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit '1d647ab5591ff58796868513edc62050c99b6541':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 22:01:53 +00:00
Christopher Tate
61eae1605d am ac3aed96: am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit 'ac3aed96eb9d3ac5bde4c4a56d1b7ba5c2a079f0':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 21:48:24 +00:00
Christopher Tate
ac3aed96eb am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit 'cdf7961f73f7ee313cbcd2f16750228cc57bcb5e':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 21:42:18 +00:00
Chris Craik
1ecddc0d3b am 204b3019: am 9977d890: am 438fe593: Merge "Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates" into lmp-mr1-dev 
* commit '204b30191a77feb6cf56f2aab7de83ea6017b6d2':
  Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates
 2014-10-02 21:35:08 +00:00
Christopher Tate
004c16654f Tweak wallpaper restore acceptance heuristics 
We now accept for restore any image that is at least wide enough to
fit the screen, and has a height within a comfortable margin of the
previously stated target.

Bug 17677006

Change-Id: I5937a82ddfbfa0bbb30d568621eb48e4b3533fac
 2014-10-02 14:27:09 -07:00
Chris Craik
204b30191a am 9977d890: am 438fe593: Merge "Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates" into lmp-mr1-dev 
* commit '9977d890e2e063a8e6bcd3d78005e5d0822cf7db':
  Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates
 2014-10-02 20:12:55 +00:00
Chris Craik
438fe5937f Merge "Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates" into lmp-mr1-dev 2014-10-02 20:02:31 +00:00
Dianne Hackborn
67a101aa30 SDK only: Update docs to reflect current implementation. 
Change-Id: I498425bb55b157c954af6a2441d8bd9be3871c55
 2014-10-02 12:44:01 -07:00
Newton Allen
df2b8a1cb9 am 58f75627: am 94f5155d: am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit '58f75627d195082e263f6d6d8e3c46c6d0970e63':
  Fix some documentation typos.
 2014-10-02 19:43:39 +00:00
Jeff Brown
9615697902 Fix race in RecognizerService teardown. 
Use a WeakReference to refer to the outer class to prevent leaks.
Ensure atomicity of access to the reference.

Bug: 17584947
Change-Id: I7ad7c7793b60fa125e04fc4d803ed905e8a00a95
 2014-10-02 12:10:08 -07:00
Newton Allen
94f5155d6c am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'c68aad9fd0f7937176ac6a8238e6236dd7ea3427':
  Fix some documentation typos.
 2014-10-02 16:52:50 +00:00
Newton Allen
c68aad9fd0 am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
  Fix some documentation typos.
 2014-10-02 16:47:19 +00:00