Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,068 Commits 3 Branches 0 Tags
bac2f3e4e496497cd65a5e807c7825bbb751fe53
Commit Graph

53139 Commits

Author SHA1 Message Date
John Reck
f0a79ac935 am 0d8f5352: am 767ec843: Merge "Set the right reportNextDraw" into mnc-dev 
* commit '0d8f53528efb2c5d2e9eeeaaf92fe852082c4b34':
  Set the right reportNextDraw
 2015-06-10 18:28:02 +00:00
Dan Sandler
96beb6babd am 07a07e14: am 382225af: Merge "Null check when reconstituting legacy icon data." into mnc-dev 
* commit '07a07e14972cf3bd2cc2e9ce8ac8fde28e251302':
  Null check when reconstituting legacy icon data.
 2015-06-10 18:27:56 +00:00
Chien-Yu Chen
8a9fa21975 am b1eb5b8f: am a3a0ea3b: Merge "Camera2: Clarify capture order for reprocess" into mnc-dev 
* commit 'b1eb5b8f69ccb25470dcbd14e7854840d67975b7':
  Camera2: Clarify capture order for reprocess
 2015-06-10 18:15:02 +00:00
John Reck
767ec84354 Merge "Set the right reportNextDraw" into mnc-dev 2015-06-10 18:05:03 +00:00
Dan Sandler
382225af47 Merge "Null check when reconstituting legacy icon data." into mnc-dev 2015-06-10 18:03:02 +00:00
Chien-Yu Chen
a3a0ea3b1b Merge "Camera2: Clarify capture order for reprocess" into mnc-dev 2015-06-10 17:51:18 +00:00
John Reck
6fa9512e34 Set the right reportNextDraw 
Bug: 8012229

mReportNextDraw is set by resized to have updateWindow() do
its thing. However if we are in updateWindow() and the
relayout() call to WindowManager wants us to report the draw
we should set reportNextDraw instead of mReportNextDraw
so that we report that frame instead of at the accidental next
invalidate.

Change-Id: If6c38d95599469831a0bd5e4d2b3f6c4f259e40c
 2015-06-10 10:25:20 -07:00
Clara Bayarri
0dd41507d5 am dc904377: am 89124000: Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 
* commit 'dc904377e7572fbead60d0fa66716de4e92770c2':
  Fix Floating tool bar flickers after long pressing on empty region.
 2015-06-10 17:13:53 +00:00
Makoto Onuki
f8d8a6c9b3 am d3acdf2a: am e6d8ffb4: Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 
* commit 'd3acdf2a4814c2a476faf444d03887f162235a78':
  Add more result extras for ACTION_GET_PERMISSIONS_COUNT
 2015-06-10 16:59:55 +00:00
Clara Bayarri
89124000c6 Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 2015-06-10 16:50:46 +00:00
Makoto Onuki
e6d8ffb40f Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 2015-06-10 16:38:55 +00:00
Keisuke Kuroyanagi
b9a8fc0cbf am b5f1641a: am 136a462c: Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 
* commit 'b5f1641a34bd70b0758d25a547229234a646c6ef':
  Revert "Fix: Crash when modifying text while using drag accelerator."
 2015-06-10 15:56:23 +00:00
Keisuke Kuroyanagi
136a462c8b Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 2015-06-10 15:13:16 +00:00
Keisuke Kuroyanagi
eac4556e55 Revert "Fix: Crash when modifying text while using drag accelerator." 
This reverts commit 259292ff3d.

This introduced another bug (Bug: 21687602) and this is no longer useful
for the original one (Bug: 21178876).


Change-Id: I59acc161e7d8cba633718a3d17292e68740ef79e
 2015-06-10 15:02:22 +00:00
Chet Haase
f8aed4589e am 15fb34d2: am 81728b86: Merge "Clarify docs for Animator.isStarted()" into mnc-dev 
* commit '15fb34d2ea6282144a3826bbe3f3ae122b6dd755':
  Clarify docs for Animator.isStarted()
 2015-06-10 15:02:09 +00:00
Chris Wren
1d8d111a16 am 7f588404: am 300a1416: Merge changes from topic \'tron\' into mnc-dev 
* commit '7f588404c531db878597f1221d56907c5c40de5e':
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 15:02:04 +00:00
Andrew Flynn
4fda24fece am c570a629: am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'c570a6290f6051346bbbfb0e9e8fbe8d7ede8d99':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-10 15:01:32 +00:00
Andrei Stingaceanu
52243ad30d am 15f4dd72: resolved conflicts for merge of 1c96a941 to mnc-ub-dev 
* commit '15f4dd72192f11982a41d2fd92b7c2302b521476':
  Completely remove ExtractActionMode from ExtractEditLayout
 2015-06-10 15:01:27 +00:00
Chet Haase
81728b862e Merge "Clarify docs for Animator.isStarted()" into mnc-dev 2015-06-10 14:27:47 +00:00
Chris Wren
300a141650 Merge changes from topic 'tron' into mnc-dev 
* changes:
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 14:14:41 +00:00
Andrew Flynn
da9bbf7255 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-10 11:41:32 +00:00
Andrei Stingaceanu
1c96a94184 Merge "Completely remove ExtractActionMode from ExtractEditLayout" into mnc-dev 2015-06-10 11:19:18 +00:00
Chris Banes
1f5714c610 am d64c5bef: am d9b0acd2: Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 
* commit 'd64c5befd61434168b16f6eb1b722b7d3512f15a':
  Fix location for ActionMenuItemView cheat sheet
 2015-06-10 09:57:52 +00:00
Chet Haase
4ddd9257d6 Clarify docs for Animator.isStarted() 
Behavior is different than spec'd for one-shot animators, clarified
docs to reflect that.

Issue #21087798 better docs for isStarted()

Change-Id: I499a5d52cf02ef715acb6ae0635ede4328c93de8
 2015-06-10 10:42:50 +01:00
Chris Banes
d9b0acd2eb Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 2015-06-10 08:12:51 +00:00
Martijn Coenen
0c2d3d93dd am b1c579df: am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit 'b1c579df0be37a43101f2a2c8205b2fe648c1377':
  Make peer LLCP version an int.
 2015-06-10 07:20:39 +00:00
Martijn Coenen
706f23ddb9 Merge "Make peer LLCP version an int." into mnc-dev 2015-06-10 06:58:20 +00:00
Martijn Coenen
bdc34b8440 Make peer LLCP version an int. 
And split major/minor.

Bug: 21343778
Change-Id: Ie9f0ecc9172849d3b088a0c1ce6d872b2f607919
 2015-06-10 08:49:02 +02:00
Jeff Sharkey
d6c886f862 am f355a22d: am e687929f: Merge "Flags to select storage volume for app installs." into mnc-dev 
* commit 'f355a22d1421a640bf057047b7833000acf94519':
  Flags to select storage volume for app installs.
 2015-06-10 05:07:51 +00:00
Jeff Sharkey
e687929f33 Merge "Flags to select storage volume for app installs." into mnc-dev 2015-06-10 04:43:18 +00:00
Jeff Sharkey
ab2340996a Flags to select storage volume for app installs. 
Remote callers can now provide the "--install-location" value from
the APK to help select a location, or they can explicitly force a
volume by UUID.

Bug: 21676789
Change-Id: Iefc92d770a851fc33e37edbf259fdb8df2b14ae5
 2015-06-09 21:42:22 -07:00
Yao Chen
4af0945647 am 72df690c: am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 
* commit '72df690ce07c20ef45c7a8a60b90e0ef70a1263b':
  Copy lockTaskLaunchMode from target activity to its alias.
 2015-06-10 03:48:36 +00:00
Yao Chen
a0d41262d4 Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 2015-06-10 03:28:29 +00:00
Svetoslav
54dd1e4c73 am 60022334: am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev 
* commit '60022334b7bff4a8c985465186e7472215178819':
  Use who when requesting permissions
 2015-06-10 01:54:27 +00:00
Dianne Hackborn
3fca7b7929 am 4f8fdd93: am 113769d7: Merge "Fix NPE." into mnc-dev 
* commit '4f8fdd93329e5f78a21e6eeee75f99a6c9399743':
  Fix NPE.
 2015-06-10 01:29:22 +00:00
Svetoslav
a1e60f1f45 Merge "Use who when requesting permissions" into mnc-dev 2015-06-10 01:29:21 +00:00
Svetoslav
970b59cbe3 Use who when requesting permissions 
Change-Id: Id0b231f8b74099b7877eb4441a1664416c641731
 2015-06-09 18:17:44 -07:00
Chien-Yu Chen
bf2d55b2b5 Camera2: Clarify capture order for reprocess 
Clarify the order of regular and reprocess requests in capture()
and captureBurst().

Bug: 21558022
Change-Id: I6bc3eda9614e43a954540ad271b4145a4dbcc8f2
 2015-06-09 18:09:11 -07:00
Dianne Hackborn
113769d70b Merge "Fix NPE." into mnc-dev 2015-06-10 01:06:29 +00:00
Christopher Ferris
8d6417f550 am 0a778262: am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 
* commit '0a7782625717252c00f39aa0748ece34adf467ce':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 00:54:00 +00:00
Dianne Hackborn
c0cdfa5947 Fix NPE. 
Change-Id: Iea1faf4b3070ed29884e133e3bab54401bd77bcf
 2015-06-09 17:53:47 -07:00
Christopher Ferris
1a4b8288ad Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 2015-06-10 00:25:32 +00:00
Dianne Hackborn
45c75dea7f am 549aacfe: am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '549aacfe9a299a61b5bc5acc2b776ac545cd855b':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-10 00:00:11 +00:00
Dianne Hackborn
4766952273 Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 2015-06-09 23:33:52 +00:00
Wale Ogunwale
a70c0d7aa1 am d43ee126: am 2c4643dd: Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 
* commit 'd43ee1260e5cd9fb7cd56d38557b494bc475612f':
  Fixed issue with using wrong display id when creating context for displays
 2015-06-09 23:27:44 +00:00
Wale Ogunwale
2c4643dd80 Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 2015-06-09 23:01:05 +00:00
Yao Chen
597ad3fb51 Copy lockTaskLaunchMode from target activity to its alias. 
Bug: 21675800
Change-Id: I518f71d57b0a113797fb3879b776cc7142351218
 2015-06-09 16:00:14 -07:00
Jim Miller
dfe46032e7 am 2fb726fe: am 31ed2044: Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev 
* commit '2fb726fe203dd7b0e554ebc3f03593593793c3b6':
  Add documentation for possible AndroidKeyStore exceptions to authenticate() call
 2015-06-09 22:55:14 +00:00
Chris Craik
6460673596 am 57998147: am 751afe20: Merge "Dont ignore layer paint alpha in software path" into mnc-dev 
* commit '5799814745c2e98bf6a721b01dff019d022d4a78':
  Dont ignore layer paint alpha in software path
 2015-06-09 22:55:06 +00:00
Wale Ogunwale
cac3dc636d Fixed issue with using wrong display id when creating context for displays 
Bug: 21729214
Change-Id: I58b6712e2929e758c3fc3b2d493991ba0262dec9
 2015-06-09 15:35:02 -07:00