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

42729 Commits

Author SHA1 Message Date
Chris Craik
cdc707b479 am 2cf2ae72: am 1155ed19: am 0aa69ff2: am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev 
* commit '2cf2ae7231544237d7ebbc7d4c823a8eb81e9b22':
  Avoid changeBounds animations on Views that are not yet laidout
 2014-10-07 00:20:52 +00:00
Chris Craik
2cf2ae7231 am 1155ed19: am 0aa69ff2: am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev 
* commit '1155ed1920fb93ff79e4e61fc928f6bd1d68c18c':
  Avoid changeBounds animations on Views that are not yet laidout
 2014-10-07 00:13:22 +00:00
Chris Craik
0aa69ff2ff am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev 
* commit '1a6c41fbad9c1c6725d189fdcf7dae2fe3f00b4d':
  Avoid changeBounds animations on Views that are not yet laidout
 2014-10-06 23:51:05 +00:00
Chris Craik
1a6c41fbad am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev 
* commit '6c9f0a01602697aaed99f54c4db0d6296701ed43':
  Avoid changeBounds animations on Views that are not yet laidout
 2014-10-06 22:35:19 +00:00
Chris Craik
6c9f0a0160 Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev 2014-10-06 22:06:23 +00:00
Chris Craik
f791703f9b Avoid changeBounds animations on Views that are not yet laidout 
bug:17683930

This means that GONE views with empty bounds don't trigger
ChangeBounds animations the first time they're shown.

Change-Id: I6503c5b0a790d3d31f7566fab27a0b12c5f61f26
 2014-10-06 14:55:17 -07:00
Dianne Hackborn
22dbaddf58 am 8b718b80: am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '8b718b80e0caf179a174f8417fe4f5b875297de6':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:43:58 +00:00
John Spurlock
0816ecd0af am 29ab5f7d: am 42730c93: am b6f5cb3e: am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit '29ab5f7dc0e9ba2ef3db2993d9ac5f9a48e9df12':
  Fix NPE in StrictMode handling.
 2014-10-06 19:43:49 +00:00
Dianne Hackborn
8b718b80e0 am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit 'db75703b261e1d1446cca210d7dcafa3279c31bc':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:39:50 +00:00
John Spurlock
29ab5f7dc0 am 42730c93: am b6f5cb3e: am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit '42730c93466d2ff533b42f56b4dd0080aad40d59':
  Fix NPE in StrictMode handling.
 2014-10-06 19:39:41 +00:00
Dianne Hackborn
2f577e83cb am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:22:53 +00:00
John Spurlock
b6f5cb3e45 am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit '81b96aadbdc3726186c91b51465fb21ead56888a':
  Fix NPE in StrictMode handling.
 2014-10-06 19:22:44 +00:00
Dianne Hackborn
90d557b7a6 am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:17:10 +00:00
John Spurlock
81b96aadbd am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit '78cc93ec80f5dcc487db697a1f9a545890745847':
  Fix NPE in StrictMode handling.
 2014-10-06 19:16:53 +00:00
Dianne Hackborn
7f7d240b13 Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 2014-10-06 18:48:34 +00:00
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
John Spurlock
9bb3dacbf9 Fix NPE in StrictMode handling. 
Bug:17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
 2014-10-06 12:36:45 -04: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
Dianne Hackborn
2d7576b082 Fix issue #17752399: Multiple apps broken by GET_TASKS permission change 
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
 2014-10-03 16:26:04 -07: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